diff --git a/dev-libs/libassuan/libassuan-2.4.2.ebuild b/dev-libs/libassuan/libassuan-2.4.2.ebuild
index e47dc8db6d16..e01dd61dc5be 100644
--- a/dev-libs/libassuan/libassuan-2.4.2.ebuild
+++ b/dev-libs/libassuan/libassuan-2.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.7.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.7.1.ebuild
index bdecc4445b2a..25a19d60f6d5 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.7.1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 MIT"
SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libpcre/libpcre-8.38-r1.ebuild b/dev-libs/libpcre/libpcre-8.38-r1.ebuild
index 7fb6a5bc3f66..3f397b8b8d42 100644
--- a/dev-libs/libpcre/libpcre-8.38-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-8.38-r1.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="BSD"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
diff --git a/dev-perl/URI/URI-1.710.0.ebuild b/dev-perl/URI/URI-1.710.0.ebuild
index 6c1623697334..58f9b918508b 100644
--- a/dev-perl/URI/URI-1.710.0.ebuild
+++ b/dev-perl/URI/URI-1.710.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Uniform Resource Identifiers (absolute and relative)"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
new file mode 100644
index 000000000000..314b37cccfd2
--- /dev/null
+++ b/dev-python/awscli/Manifest
@@ -0,0 +1 @@
+DIST awscli-1.10.38.tar.gz 471647 SHA256 56fc0d938aa1ee6ec71c9e7f6f0d7b96614419ccd7c7edf99a8dc071ad26a105 SHA512 bb4dd3547083ef80bac4461a96daad254a70754611336233be3111ff32897c6197966ba17e4f623eeabd18abe78723a0b50abd89caab341faffe7d2e3c57aab4 WHIRLPOOL eb17ed85e6ece0b0628e6cd0f5722b0c97e25ad54518289316da96f650d4474a466bbc08577bc5232529f6ddfd82cb536bf5d76e079c9cec5b25dc948de13d74
diff --git a/dev-python/awscli/awscli-1.10.38.ebuild b/dev-python/awscli/awscli-1.10.38.ebuild
new file mode 100644
index 000000000000..f1631b5ae3ce
--- /dev/null
+++ b/dev-python/awscli/awscli-1.10.38.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="http://pypi.python.org/pypi/awscli"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-python/botocore[${PYTHON_USEDEP}]
+ <=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ <=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+ dev-python/s3transfer[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ "
diff --git a/dev-python/awscli/metadata.xml b/dev-python/awscli/metadata.xml
new file mode 100644
index 000000000000..04b47d114ad5
--- /dev/null
+++ b/dev-python/awscli/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ python@gentoo.org
+ Python
+
+
+ awscli
+
+
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 9c2995fe2ae4..7e275d3d9749 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,3 +2,4 @@ DIST botocore-1.3.22.tar.gz 2349601 SHA256 02a6d320b09179bc5dcbafd4be732d9431bfe
DIST botocore-1.4.22.tar.gz 2495807 SHA256 9807c405e85ed5af817529b04194150cfe37277bbf6879cff1a9c9b5d75311ef SHA512 6c0c37404ef202031d336af197b1fde1434b0f8f5eda0537edc5a45a0f53ba9619443c2d6d5d31d8b0804f6c517a7b202f8af2d144e9dff159d3e43b3c395172 WHIRLPOOL 3a3f5b42c88a1663503ff9bd5f47311ec7a0b23012897b9c8dbb65ab00ae3a889babadfea04d38c34f4196124a9345cc280f44525b433e153a9e6fb3dd65e8be
DIST botocore-1.4.25.tar.gz 2498910 SHA256 1b67bb78a1ebd0ffe9daf5ee33196b7c02a196c9b46799b9a2c35237ebd77fe2 SHA512 afca40e06af741cc05a06b16ee1f4c42a6a83ef8c055e8c8caac75ab65614dd187632ca2910068ad8c528e0fd7c0c5ba02bd35b1634f6274580186c23cf15855 WHIRLPOOL f0e563bf6da5b2b879811155dfe97cc5f8a07377c2c9d4d464870beb9b2d6ab8e5c7ea8c860551756e9ce8e0f1268aa1e1e36f9d9f5a1f438086b5242f2a7689
DIST botocore-1.4.27.tar.gz 2502287 SHA256 1d18565c45ab1eeb7e5e237c7aa1ce81b6376fa63e5a9d948c5bcdfb5fe27d75 SHA512 2ce94ed553ac513db0000201620f5bb8d8af85104d2ab7b2d8d23a50ca4d01bd2c5eccae8172f379a749ca80dcb827c430412ef6ae7d73f0a2022e6119d71dc5 WHIRLPOOL 2bb20b63b38dba3c3ff28e2e5b2d927897c6ef56a4828ac496d5e3397512a7786336c7026c1c11786db8abcb93afdebe2e429c0eee3371d2041d7bc568b192e8
+DIST botocore-1.4.28.tar.gz 2503928 SHA256 145e41531a5d38862974ddf45c055e1561046f72caa04564f0435d25cf62dbe1 SHA512 51feb906bc82c66054d0b4b09041377c67839cfbe9dcf39975060b3c1acb9d8e5607fb43e93199d321ab890410550de7f7812598aeecad6709ce1317a19a3bc6 WHIRLPOOL d089d9d5a038cb8253d7a4194d66972e1ac1a0ddb92d90e3bf8a48de9c87a74ddbccef7eebe475f778ad03d6a7102c38d1905016600d51848bcef9c584136821
diff --git a/dev-python/botocore/botocore-1.4.28.ebuild b/dev-python/botocore/botocore-1.4.28.ebuild
new file mode 100644
index 000000000000..9c57e3342b4c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.4.28.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+ >=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ =dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+ =dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+ =dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+
+
+
+
+ python@gentoo.org
+ Python
+
+
+ s3transfer
+
+
diff --git a/dev-python/s3transfer/s3transfer-0.0.1.ebuild b/dev-python/s3transfer/s3transfer-0.0.1.ebuild
new file mode 100644
index 000000000000..eb56624064c1
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Amazon S3 Transfer Manager"
+HOMEPAGE="http://pypi.python.org/pypi/s3transfer"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-python/botocore[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ "
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index fc57e29cae21..8022bb3c93fb 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 20 Jun 2016 08:40:45 +0000
+Mon, 20 Jun 2016 13:10:49 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index fc57e29cae21..11ccdccaa650 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 20 Jun 2016 08:40:45 +0000
+Mon, 20 Jun 2016 13:10:50 +0000
diff --git a/metadata/md5-cache/dev-libs/libassuan-2.4.2 b/metadata/md5-cache/dev-libs/libassuan-2.4.2
index 218397650309..1a6301a8e3fc 100644
--- a/metadata/md5-cache/dev-libs/libassuan-2.4.2
+++ b/metadata/md5-cache/dev-libs/libassuan-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=IPC library used by GnuPG and GPGME
EAPI=5
HOMEPAGE=http://www.gnupg.org/related_software/libassuan/index.en.html
IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3 LGPL-2.1
RDEPEND=>=dev-libs/libgpg-error-1.8
SLOT=0
SRC_URI=mirror://gnupg/libassuan/libassuan-2.4.2.tar.bz2
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=aedcea08c73c113dd8fe4d11f75bc14d
+_md5_=54c06c86c8eac85eb6a0ea9115b93658
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.7.1 b/metadata/md5-cache/dev-libs/libgcrypt-1.7.1
index c41802096f5f..1d739da8f055 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.7.1
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
EAPI=5
HOMEPAGE=http://www.gnupg.org/
IUSE=doc 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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=LGPL-2.1 MIT
RDEPEND=>=dev-libs/libgpg-error-1.12[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-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
SLOT=0/20
SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.7.1.tar.bz2
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-multilib 77afca16a6cb82823eed6366a10e7f75 autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=f7eb11b21292863830d37054fc547349
+_md5_=8feef776db271dc5d7ee8f19fae54fdc
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.38-r1 b/metadata/md5-cache/dev-libs/libpcre-8.38-r1
index 843ca444ae02..b3cf122d0837 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.38-r1
+++ b/metadata/md5-cache/dev-libs/libpcre-8.38-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
EAPI=5
HOMEPAGE=http://www.pcre.org/
IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib 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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
SLOT=3
SRC_URI=mirror://sourceforge/pcre/pcre-8.38.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.38.tar.bz2
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=866c939fa4a7eb1c592a1f3a756a9e3c
+_md5_=8564b5121eb5da7b4aa0c5894b33e7b8
diff --git a/metadata/md5-cache/dev-perl/URI-1.710.0 b/metadata/md5-cache/dev-perl/URI-1.710.0
index 5b65946daaaf..b4bc55748017 100644
--- a/metadata/md5-cache/dev-perl/URI-1.710.0
+++ b/metadata/md5-cache/dev-perl/URI-1.710.0
@@ -4,10 +4,10 @@ DESCRIPTION=Uniform Resource Identifiers (absolute and relative)
EAPI=6
HOMEPAGE=http://search.cpan.org/dist/URI/
IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=>=virtual/perl-Exporter-5.570.0 >=virtual/perl-MIME-Base64-2 virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/URI-1.71.tar.gz
_eclasses_=multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=9d22c947e22fd53ee9b4a3fe4e708683
+_md5_=5474e788e019d49137ffb089e85475a1
diff --git a/metadata/md5-cache/dev-python/awscli-1.10.38 b/metadata/md5-cache/dev-python/awscli-1.10.38
new file mode 100644
index 000000000000..75fded8ce7af
--- /dev/null
+++ b/metadata/md5-cache/dev-python/awscli-1.10.38
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/colorama-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/rsa-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/s3transfer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=6
+HOMEPAGE=http://pypi.python.org/pypi/awscli
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/colorama-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/rsa-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/s3transfer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/a/awscli/awscli-1.10.38.tar.gz
+_eclasses_=distutils-r1 3a17743abcc9335483329f33c87b472d multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=b9d69d21b2ef37e87359709f2fb65307
diff --git a/metadata/md5-cache/dev-python/botocore-1.4.28 b/metadata/md5-cache/dev-python/botocore-1.4.28
new file mode 100644
index 000000000000..3ef4a8cdac1f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.4.28
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/guzzle_sphinx_theme-0.7.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/sphinx-1.1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/docutils-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jmespath-0.7.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Low-level, data-driven core of boto 3.
+EAPI=5
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/docutils-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jmespath-0.7.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.4.28.tar.gz
+_eclasses_=distutils-r1 3a17743abcc9335483329f33c87b472d eutils 792f83d5ec9536cb5ccef375469d8bde multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=a2d1740279b122c012394f9f2c9deadb
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.0.1 b/metadata/md5-cache/dev-python/s3transfer-0.0.1
new file mode 100644
index 000000000000..46a595bbcbd6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/s3transfer-0.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Amazon S3 Transfer Manager
+EAPI=6
+HOMEPAGE=http://pypi.python.org/pypi/s3transfer
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.0.1.tar.gz
+_eclasses_=distutils-r1 3a17743abcc9335483329f33c87b472d multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=ae6316fe854e28075859760d58afab3b
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.621 b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.621
deleted file mode 100644
index 219f87d2331e..000000000000
--- a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.621
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prerm setup test unpack
-DEPEND=amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) app-arch/unzip
-DESCRIPTION=Adobe Flash Player
-EAPI=5
-HOMEPAGE=http://www.adobe.com/products/flashplayer.html http://get.adobe.com/flashplayer/ https://helpx.adobe.com/security/products/flash-player.html#version11
-IUSE=debug kde selinux cpu_flags_x86_sse2 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=-* amd64 x86
-LICENSE=AdobeFlash-11.x
-RDEPEND=amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) abi_x86_64? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) abi_x86_32? ( amd64? ( >=dev-libs/atk-2.10.0[abi_x86_32(-)] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/nspr-4.10.4[abi_x86_32(-)] >=dev-libs/nss-3.15.4[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] >=x11-libs/pango-1.36.3[abi_x86_32(-)] ) x86? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) selinux? ( sec-policy/selinux-flash )
-REQUIRED_USE=cpu_flags_x86_sse2 debug? ( abi_x86_32 ) || ( abi_x86_64 abi_x86_32 )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=abi_x86_32? ( !debug? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.621/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.621.i386.tar.gz ) debug? ( http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz -> adobe-flash-11.2.202.621-debug.i386.tar.gz ) ) abi_x86_64? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.621/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.621.x86_64.tar.gz )
-_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde mozextension 3d8ee4835f89ff39d4666656aa603433 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 nsplugins bf5bfcef1d2f0adad7e6230455df8e91 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7c8f505067add5c82332308e4fd589ac
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index fc57e29cae21..11ccdccaa650 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 20 Jun 2016 08:40:45 +0000
+Mon, 20 Jun 2016 13:10:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 6039083c6d3f..36df5c1e878f 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jun 20 08:39:49 UTC 2016
+Mon Jun 20 13:09:54 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d7ad65e374c5..8d920219b6b2 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 20 Jun 2016 09:30:01 +0000
+Mon, 20 Jun 2016 13:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index bef1a33b1872..bec54f151fe9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1466412001 Mon 20 Jun 2016 08:40:01 AM UTC
+1466428201 Mon 20 Jun 2016 01:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index fc57e29cae21..8022bb3c93fb 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 20 Jun 2016 08:40:45 +0000
+Mon, 20 Jun 2016 13:10:49 +0000
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index ed34d730dcbc..660862f8370f 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,6 +1,3 @@
-DIST adobe-flash-11.2.202.621-debug.i386.tar.gz 7459844 SHA256 2d1cbb9f8d73120ac4f717ca216b9742ffb13ca5a68413fc5e830c210045a947 SHA512 e9e0e5d44f4450c00a532414999ff44a381a836430227976d30f6a504badc2aeb54b4c7187629f6ec812606577c9483b3da0b5af40f99aa5b4b444433928b1d0 WHIRLPOOL 860d8089646a44e6967e4b99f8be9c4408b69258ee439259fd2def34bbbf53975ea9cb2e891148913e4f4844527a872a89c2c8f93f51a192628c5d70a6afabcc
-DIST adobe-flash-11.2.202.621.i386.tar.gz 6978540 SHA256 137c87098f0fa9d02a3ab49e9e07a486e7a09e7b68f151294ee3c957d7d51d45 SHA512 ce1ecfe1fc8c5b617bbb87bc8677be96630cf91547baa960c8be7eea341da4b09faebd69bc28eda23a407493c2dafcf28c652ae40ee2c71a06e5cc37f76454a3 WHIRLPOOL cca2d87e0d0167cc8b5277555422b3bb9cdeeb1a34d294d6b38fef2c996037c7ef2584254878e27f7b69f4e2bfe59a8de6b3925c02ef84f38d50787be411cd48
-DIST adobe-flash-11.2.202.621.x86_64.tar.gz 7290265 SHA256 c8860c0f21bd90b78f023b4ce7a12ab48cc63f20524b2d60fd032755169fa92e SHA512 474ab3c1ea3642a248352467cb17cf27949af99ced2cf2f98dd070b3c170dd78c761afd062beb576039bcd414d3b177c5b7f12503d90e806e354982e62118a02 WHIRLPOOL f0b45743ef9e45d6496fa3605ad147d9fc46c99cb0ede7e800710e556285e824159c0a4b768702f268f5e470cd4e33be7048b1e36d589f39db4e1d6cdc81eb6e
DIST adobe-flash-11.2.202.626-debug.i386.tar.gz 7465648 SHA256 830269b22315898096d45576ecc13ab34f9ecd40e73fa1bc6558a9ca070686fe SHA512 d772c2833065ac26b0253a41d3e9a8c13b9fc342f6698cc88823a7a8989442cc293a8e7493a813cb386c24800999d17549006f35090eac6a3e7f606aa1e450e3 WHIRLPOOL 5369798eb5e2578295de95406c0aa434be9fecbd094c3697d66deb10fba5a62af66af0dba7d77447fe3c6a9f2017db7e8dc36016b039e0633700b9382c87e77c
DIST adobe-flash-11.2.202.626.i386.tar.gz 6981743 SHA256 1ec079f9d8578255435e15f704f05e4af69e749a480427af2be64fe447e2ca8c SHA512 d88c893cf11bd4d93dc77971e2c0cb50e59ae371b1f4e3dfeda2046b9f571f93ea074b35de9bf824aa67f5bee6cc4ac987a387451457bdc686d0a1d4dee28798 WHIRLPOOL a9c70f90d8c6af66f1bd1c03ebeb8f584bda7b9798daef97b65a6dd2455d018f0dc1a57c373327079eccf911af88cf421fd56faa9e6a47cd6257c41745a3a271
DIST adobe-flash-11.2.202.626.x86_64.tar.gz 7295646 SHA256 14f6f10c664984302e2cb67bda06b8da8358cf4110235a3ad1dff06df22ad0ad SHA512 13d0f0aa206e4ca3e4e024760574d3e05445d57979a951ae3e5d51b61da8adae2b953f9b642be13c158cbb0fcd824ff4ff6af6636a01b7078a517af84506a595 WHIRLPOOL c465e13280152d809f8bd314257d46581b8828664592da33bef0af471cb98d300324e96e2312dedf86509ab87ebea2d54dbcc8d1bd2b8d45a70b68c9c874b216
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.621.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.621.ebuild
deleted file mode 100644
index 2fcbb7edb4ef..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.621.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
-
-DESCRIPTION="Adobe Flash Player"
-HOMEPAGE="
- http://www.adobe.com/products/flashplayer.html
- http://get.adobe.com/flashplayer/
- https://helpx.adobe.com/security/products/flash-player.html#version11
-"
-
-AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
-AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters"
-PV_M=$(get_major_version)
-AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz"
-AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
-AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz"
-
-SRC_URI="
- abi_x86_32? (
- !debug? ( ${AF_32_URI} )
- debug? ( ${AF_32_DB_URI} )
- )
- abi_x86_64? ( ${AF_64_URI} )
-"
-IUSE="debug kde selinux cpu_flags_x86_sse2"
-REQUIRED_USE="
- cpu_flags_x86_sse2
- debug? ( abi_x86_32 )
- || ( abi_x86_64 abi_x86_32 )
-"
-SLOT="0"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="AdobeFlash-11.x"
-RESTRICT="strip mirror"
-
-S="${WORKDIR}"
-
-NATIVE_DEPS="
- dev-libs/atk
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- kde? (
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- dev-qt/qtsvg:4
- kde-base/kdelibs
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXpm
- )
- media-libs/fontconfig
- media-libs/freetype
- >=sys-libs/glibc-2.4
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/pango
-"
-
-DEPEND="
- amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
-"
-RDEPEND="
- ${DEPEND}
- abi_x86_64? ( ${NATIVE_DEPS} )
- abi_x86_32? (
- amd64? (
- >=dev-libs/atk-2.10.0[abi_x86_32(-)]
- >=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
- >=dev-libs/nspr-4.10.4[abi_x86_32(-)]
- >=dev-libs/nss-3.15.4[abi_x86_32(-)]
- >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
- >=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
- >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
- >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
- >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
- >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
- >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
- >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
- >=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
- >=x11-libs/libXt-1.1.4[abi_x86_32(-)]
- >=x11-libs/pango-1.36.3[abi_x86_32(-)]
- )
- x86? ( ${NATIVE_DEPS} )
- )
- || ( media-fonts/liberation-fonts media-fonts/corefonts )
- selinux? ( sec-policy/selinux-flash )
-"
-
-# Ignore QA warnings in these closed-source binaries, since we can't fix them:
-QA_PREBUILT="usr/*"
-
-any_cpu_missing_flag() {
- local value=${1}
- grep '^flags' /proc/cpuinfo | grep -qv "${value}"
-}
-
-pkg_setup() {
- unset need_lahf_wrapper
- if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then
- export need_lahf_wrapper=1
- fi
-}
-
-src_unpack() {
- local files=( ${A} )
-
- multilib_src_unpack() {
- mkdir -p "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
-
- # we need to filter out the other archive(s)
- local other_abi
- [[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
- unpack ${files[@]//*${other_abi}*/}
- }
-
- multilib_parallel_foreach_abi multilib_src_unpack
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
- if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
- # This experimental wrapper, from Maks Verver via bug #268336 should
- # emulate the missing lahf instruction affected platforms.
- set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \
- -oflashplugin-lahf-fix.so "${FILESDIR}/flashplugin-lahf-fix.c"
- echo "${@}" >&2
- "${@}" || die "Compile of flashplugin-lahf-fix.so failed"
- fi
-}
-
-multilib_src_install() {
- # PLUGINS_DIR comes from nsplugins.eclass
- exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
- doexe libflashplayer.so
-
- if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
- # This experimental wrapper, from Maks Verver via bug #268336 should
- # emulate the missing lahf instruction affected platforms.
- doexe flashplugin-lahf-fix.so
- fi
-
- if multilib_is_native_abi; then
- if use kde; then
- local pkglibdir=lib
- [[ -d usr/lib64 ]] && pkglibdir=lib64
-
- exeinto /usr/$(get_libdir)/kde4
- doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so
- insinto /usr/share/kde4/services
- doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
- else
- # No KDE applet, so allow the GTK utility to show up in KDE:
- sed -i usr/share/applications/flash-player-properties.desktop \
- -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
- fi
-
- # The userland 'flash-player-properties' standalone app:
- dobin usr/bin/flash-player-properties
-
- # Icon and .desktop for 'flash-player-properties'
- insinto /usr/share
- doins -r usr/share/{icons,applications}
- dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
- /usr/share/pixmaps/flash-player-properties.png
- fi
-
- # The magic config file!
- insinto "/etc/adobe"
- doins "${FILESDIR}/mms.cfg"
-}
-
-unregister_pluginwrapper() {
- # TODO: Perhaps parse the output of 'nspluginwrapper -l'
- # TODO: However, the 64b flash plugin makes
- # TODO: 'nspluginwrapper -l' segfault.
- local FLASH_WRAPPER="${ROOT}/usr/lib64/${PLUGINS_DIR}/npwrapper.libflashplayer.so"
- if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then
- einfo "Removing 32-bit plugin wrapper"
- nspluginwrapper -r "${FLASH_WRAPPER}"
- fi
-}
-
-pkg_postinst() {
- if use amd64 ; then
- if [[ ${need_lahf_wrapper} ]]; then
- ewarn "Your processor does not support the 'lahf' instruction which is used"
- ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
- ewarn "should allow this plugin to run. If you encounter problems, please"
- ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
- ewarn " ${CATEGORY}/${PN}[abi_x86_32,-abi_x86_64]"
- elog
- fi
- # needed to clean up upgrades from older installs
- if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then
- unregister_pluginwrapper
- fi
- if has_version 'www-plugins/nspluginwrapper'; then
- if use abi_x86_32 && ! use abi_x86_64; then
- einfo "nspluginwrapper detected: Installing plugin wrapper"
- local oldabi="${ABI}"
- ABI="x86"
- local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so"
- nspluginwrapper -i "${FLASH_SOURCE}"
- ABI="${oldabi}"
- fi
- elif use abi_x86_32; then
- elog "To use the 32-bit flash player in a native 64-bit browser,"
- elog "you must install www-plugins/nspluginwrapper"
- fi
- fi
-}
-
-pkg_prerm() {
- use amd64 && use abi_x86_32 && ! use abi_x86_64 && \
- unregister_pluginwrapper
-}