gentoo resync : 03.11.2017

5 files changed, 3 insertions, 169 deletions

diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 19e9578c95e3..a53508d7a9d8 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -2,26 +2,22 @@ AUX 18.2.1-wx3.0.patch 3849 SHA256 b0e1d2ed833feb0f308060c2a451fcd58fceb68c9c634
 AUX 50erlang-gentoo.el 134 SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4 SHA512 7a862e0ef1e96e88a484e80aeb92eb4465c7e8661efb0291c28abc13225eb3aa69442fe29417f5ad0d264e54399d645d9cd4713bc9869b48e87a91e50b9b2473 WHIRLPOOL 6080f0f76c90f2e5f4577e8a6fc6dd046fc671078eda215c5bd33138aad61c2f2dfc585372966b65fcca24a46df0921a3fd2c4af02c68ef02f2fff443336c702
 AUX epmd.init 407 SHA256 fdd497f5bd350368286c07c291b9144a174cec0712e9622713ccb664dcb57f2a SHA512 9a9d1c0d512e31254170a601edb3a023c1f0abfa9c02656ea86cc04f38bfd4b3bffa131cef2c20ee81d3f62073036b0dcaa399736be7d413fcfa48e4001a5304 WHIRLPOOL 671f673712abbf91171006ddb12f9eb68bc0b8569f4c472a6aee0c837ac790deb4df6f04914e9a2c778fcf2b69188b793f6083aeebdf549c7dc70ea89dca4f7c
 AUX epmd.service 138 SHA256 689a50cfe05cf644f62b2308920f8ed7f602e1de94d53a67f5fd37eb0249ef17 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28 WHIRLPOOL 7d4eb5c5290c8026bdc915210b2273cffd429ea1162cc0ad77f67661a2a660794b9518290c2437cb999abef8051275d6fd30b3dae8b98cf52c65f5c210d3c61b
-DIST otp_doc_html_18.3.tar.gz 34285271 SHA256 8fd6980fd05367735779a487df107ace7c53733f52fbe56de7ca7844a355676f SHA512 0ac429f67ca9ae7f235cda72eb0f4e5b0b43ae90b70c706aeea08be0ad88968677ccc80eb1ba006e90c9f024de586ffd91741d4cef4d614d1dfac51b407d2659 WHIRLPOOL 7d64c2ec433b4bc2da4c56290ad6d21b85d15f72fe9b78654955d27e65b26e1b929d0c9b7d5f60c25c1f16db8d22e36c2ad6ca2a75044707ccd1eea1197fa15d
 DIST otp_doc_html_19.1.tar.gz 34624316 SHA256 76c89aee1ac69b5107114b0065189101e3f42d53e929d8ef8f08b5c586f15930 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8 WHIRLPOOL 5c344246b32f21abc5ad8403c136263a6f9f5f2664b8027ad7f574e1b7cfa9b127f7863547550114b889daba363c19936cf7a0199a0bf5b4da8ac23c02dd24d0
 DIST otp_doc_html_19.3.tar.gz 35818689 SHA256 dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c SHA512 a70d2c470fa1dc0594b20af73ba36ccb7702b4192960e6fc0296738175215a43450f9bf558637f7f5e40757f7a15dcf4f1ae8a88515e211cd3c0fae45c5e1858 WHIRLPOOL 468cd8b9761fbcaa8892405f451c53bf1014067022966384db96520855366afcfb09aa9ddf1390931da2288c0620b909588637c9c4501f753413752b293a9cbe
 DIST otp_doc_html_20.0.tar.gz 33948386 SHA256 1ab25110b148ce263d6e68cd5a3b912299b6066cfcd9d2fce416a4e9b7d2543a SHA512 a183943a3a2636489cfdf3e7ede8dc4233db84a271b4b8bd655b57b4abac597b797f035d77087be72e823638898d202e08c53decb565fc10f2e444dcc6da8628 WHIRLPOOL 953bf75da7f6aa46e26e4fb6f12d22834d2a41a43e5449e3bbefbe7359f67b7a0affbb0dd6dbfebdecae9294f080a69c0637741ddcf5dbcd0db488ab5a6ddd1a
 DIST otp_doc_html_20.1.tar.gz 33059931 SHA256 442c9b75a33be685a1af67414cc8758a4ef40e27cdcab9e432d4d9c6f3254dcf SHA512 c2eb6cb63f71727ada79ea14a1b8f0b7291bc1d3cdb43bf8978b7b8948d466b9492571d3a45adc96de0eebf46eee213d27c0502ee4d9963ec7c5c0d976f257d9 WHIRLPOOL f03eff4df31352534b49b2bf8d577d16467784ed14cc9c760e4156b486caef5922a32f8676346ed38b6825507395e0e871f89ad82993e3fb59015dad9ac43da7
-DIST otp_doc_man_18.3.tar.gz 1395166 SHA256 978be100e9016874921b3ad1a65ee46b7b6a1e597b8db2ec4b5ef436d4c9ecc2 SHA512 d45d72d7ee7492e081dd5fac1a4d1cea93fe5f5287900be13c92e1c1802f7ec77573eeb4d271497154b9e0723c393700f35982ceedbe29be6cb759a0ebe83325 WHIRLPOOL 03b57a87573630a2826dd5e9a597ab0bb67daa73e4b2b733982b6ce4a3cf6a32c5ad17cb3ba3fc0a29248c867b1ba303098c7f61c0cfe42636621aa8a370790f
 DIST otp_doc_man_19.1.tar.gz 1405580 SHA256 7200e9e5b3a229a6b3838046e1b3e64afc869265539d49d0e4853212f19c0c79 SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334 WHIRLPOOL e94333be9d1d9239d1dc6e9bbcc6930b148eda8d8a73e3d21896e498c331c062ea1541d8fa03a2d0dd6f21510874f5aa6062b22a3738c85d1b18a30b09fb5482
 DIST otp_doc_man_19.3.tar.gz 1410781 SHA256 f8192ffdd7367083c055695eeddf198155da43dcc221aed1d870d1e3871dd95c SHA512 675a0d2d5972660a60de17c832e630f646f942d23815427eb0dec3a5ca1c44ed8fe35a9c30f8b608dedfd10f6fb1e47e958ea6e32e296b6f6809b1844b4da9a1 WHIRLPOOL b7fb4954a46670c672eec02df8713fe68eeb4c15fa8c56e37c802f384bafeb77d88b257ebd1f8f7a0e35e3020853211b9f46ecb01fbe16c19254a3cd992c0fc1
 DIST otp_doc_man_20.0.tar.gz 1430939 SHA256 b7f1542a94a170f8791f5d80a85706f9e8838924ea65d4301032d0c0cfb845cc SHA512 8f3c9b39c5574c239fe4f8d220884667d9d8b8231e923da8caebedc2cfd4db61a3b71a45788c3d63ae4cecc11884df9143e164c544356145977010f31c388e99 WHIRLPOOL 16b1c1448cdd3a35b340f66131a41af88e679e2e5e5383f5586f4cd386462f4a306512a068bbac8020209d6f72ef2ac57db07e4075b1d48bd0dcc0b3dfd9657a
 DIST otp_doc_man_20.1.tar.gz 1334036 SHA256 05ccf82ff85316e2eb1bebf1a1741dfac1ee450ed49cf0be365f9d4fec6d7b46 SHA512 d64cb7e78f1cbc86eccfa338ebe211b4e67ada842d780cf73dac7aadab8209a845de305644b758ed23d939688146012cd5172e005fee207307d6e24c7b7d2345 WHIRLPOOL c772d8febcece3d6b3d7b4a576424aba5f33b9d5aaf5312e5bd0e44bc7350d2e562a93d62d48288cf3dd8e050b83727da624ccf267fd60fa5ac3b28166521148
-DIST otp_src_18.3.tar.gz 68292101 SHA256 fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 SHA512 f4a69bb14743d9f913d7060cfb6426f7c54693d07ed439506ede5160a0ba5a79a81cf08a56aaa02c68b3377cd22fed66a0fbeb216378330d7ad5c6348ed82014 WHIRLPOOL 493fe8f803194647ab0c113d8f67f5f97636321618296969d9da0396cc9b083b6deffd42638fe3e3eb0b63c4ff996fb4b2c4559c6039add94f7dad62205b815b
 DIST otp_src_19.1.tar.gz 68103074 SHA256 fed4cbbc1ee5cc8efc2b8f14c3db97bfde1de967703f5f9a95f8ab6852737e23 SHA512 bd1c243393c867c91768367613aedb40d56889add149390c81f22e022e76b716d6e9a4d5db7e6477ceb1216c26c18c962abdfd8215a87420758f5ef2063b9714 WHIRLPOOL 3422ad4ab48916f79bcfd2b4550059f88e4e55340a9eb298a9039f07f899e6430eb2fd346bf52931acc2a03e86f3fc5571e9e577fce83bd2040c6cb37fb5348f
 DIST otp_src_19.3.tar.gz 68510871 SHA256 fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 SHA512 6920eab6e1681a76ab44bdd0eeb9b012e601191f91ca06edf1f63ba2e261c555d6f8dddf7025b2e9c3c6459bd63ff78659010ec33967fb1952840fb451ec2de6 WHIRLPOOL ae5b65001872dc855e45a7fbadef278a373935b66819342f4d222055043e1e1ad8974356468e2b1821b36246f5cd621c06cb2e287abab290d6891ea6cd8b698a
 DIST otp_src_20.0.tar.gz 87346046 SHA256 fe80e1e14a2772901be717694bb30ac4e9a07eee0cc7a28988724cbd21476811 SHA512 f73ea74fd149392c72925ea163eafe62ed4470405c61d1c7e557c4f3c94546b4385b073d5d53017f1f5422bdf203ea346fa3d672f49bca4cceec26c51de68951 WHIRLPOOL df800cc5dd9a79a32ebb14376ced74482cbfd85bb4e6d3af7c7b70f32c7080b1c3dee08d9769fa1e296b248c05e3aebb5a3b486f7f6f6f3e1e36486fd3044b56
 DIST otp_src_20.1.tar.gz 87342296 SHA256 900d35eb563607785a8e27f4b4c03cf6c98b4596028c5d6958569ddde5d4ddbf SHA512 76b5fcfcdd501636ae8b8392e563d03ca351fce055fca3c92354fa7fe78e150701fcfbc607e09afcc13ca04d5cbba33b15ef03b77e1f4af766dd0e6b152df7a2 WHIRLPOOL 28643aa28dc960d1187f7b4b483a75e631bf29297bf5d96cc2199989ec390a4e564391fb8c518212bd9e0852703e412d13ae7f530036643394997afb25b2cd19
-EBUILD erlang-18.3.ebuild 4587 SHA256 22e50df693e8ed0466719e07c34b04a4989b8ada7eafc6d6ff069c8e0bc67947 SHA512 e66b473b6bb3b9274f6610ad30fd47b03337a805ec00afbdc5f0620fb74bc39e0a1650ea719d67ea07ffd6532beb94f6bff980570546e0f625158220876400dc WHIRLPOOL 02f14e2ebfbe67915ad3ea588b817c55e8a542aad90b5da9a78204fdcc11bb3729f15ec7a22a01d82116934b497861902c7c7507e24422d4e14fd39b24c2e805
 EBUILD erlang-19.1.ebuild 4482 SHA256 7cbae5f26cc9c4c70e2b64ffbddc02c2a323cc4b05143d254a738961655c8940 SHA512 26067ee69b78c63a40800b87fcd41f74f1b5a04fdc9e1103b2953f1c721195ec6dfb992474d442193c0673c548ed76a3e88938cc3f93bdbee9e26403164e5e60 WHIRLPOOL 19f0566c346cad486e82bed73051c5ef45f8e23f6aad0fb89ac2df89f753ee667acd87cdd54e7f228de5d3d427154734c9c36a1e43d3dc934668a3a59541ad07
 EBUILD erlang-19.3.ebuild 4538 SHA256 a07f6247eb51337f5f64aee67a36f008e5a727258a8796e0384550d98a1af04c SHA512 fd62d9ec729574fa29267bb846ccaa46d1f4e08852b1111eefba5fc89d2d77c9fe7be00f75f7a1d2f74bbc353b436ab313211aaa7c6ce3e9099eaa4ee275f4aa WHIRLPOOL 37b08171622e3e5eb59c751408680f4095524219d973d63645d90c0b4b5b88e37b5cfeb89b36a6fe3a0cb3fc634fdce8066f770aa3b4623fbdee5e392f9d6f1f
 EBUILD erlang-20.0.ebuild 4538 SHA256 a07f6247eb51337f5f64aee67a36f008e5a727258a8796e0384550d98a1af04c SHA512 fd62d9ec729574fa29267bb846ccaa46d1f4e08852b1111eefba5fc89d2d77c9fe7be00f75f7a1d2f74bbc353b436ab313211aaa7c6ce3e9099eaa4ee275f4aa WHIRLPOOL 37b08171622e3e5eb59c751408680f4095524219d973d63645d90c0b4b5b88e37b5cfeb89b36a6fe3a0cb3fc634fdce8066f770aa3b4623fbdee5e392f9d6f1f
 EBUILD erlang-20.1.ebuild 4538 SHA256 a07f6247eb51337f5f64aee67a36f008e5a727258a8796e0384550d98a1af04c SHA512 fd62d9ec729574fa29267bb846ccaa46d1f4e08852b1111eefba5fc89d2d77c9fe7be00f75f7a1d2f74bbc353b436ab313211aaa7c6ce3e9099eaa4ee275f4aa WHIRLPOOL 37b08171622e3e5eb59c751408680f4095524219d973d63645d90c0b4b5b88e37b5cfeb89b36a6fe3a0cb3fc634fdce8066f770aa3b4623fbdee5e392f9d6f1f
 MISC ChangeLog 6939 SHA256 b53b63e91b559d7d54089facf45163140f393c1eec45f68e49ea2c425dd3e392 SHA512 dcf45a4d02ef5a9705ea67ce7c843adeb5dbef927cb5a03f4143e45ec49f6f302a65ec6050a8bd4ff9850841e1984b47d082f280b06264531058f2abd20481e5 WHIRLPOOL 0106b9728d365040debe47f0237b279492ef606bcfc28aca8795c4a92a15412beacb65c31c23ebae1e307387191ccf89390b6dcc3eef8cd6656879637506554c
 MISC ChangeLog-2015 42199 SHA256 a9beab51a32c9af7307a3954d3ff27d3716ec4809ed8944df3f696110474994f SHA512 bd29ac327f61d9c50230bd83c54c38e3dbe5c520af3a4a21315459927281e99e637cdb6e9e59e167e0da6745917d93320f4e831e893c99d562773225f8ebe8db WHIRLPOOL 5a5861a5200a9c521b6feca878f760d95f12af1d49f1e4ba8a9f331e0fb308ede81f58bd0b01802abef5b697a4e42216ee0fb4aa2e6093a375a3d2df476e6b96
-MISC metadata.xml 758 SHA256 fbfd5a67e7b069b54ac80a82d9250107ad27d150ebc0f38ca4b97936dabc8807 SHA512 b430d16cc736f7a1e8ab9b08c3e79885fe860bce973908a22c5835291582431507746bb5ec3ffc7fe219380e04c5b9b2ac2602997b413548b66785c90c0b71fd WHIRLPOOL ddfdf8b93b774471a15e1770583cb1909db816bee57e886973cd6b6bd2e4852f44f49159ff5ab6fa4164b2a42ea109af48f433a020de22a1a0c574d75831dc13
+MISC metadata.xml 700 SHA256 cff7cfdac66d872af4a996d2abf28b0596b2d19778c971155ad8fa778f67ea86 SHA512 cada8e7cf719a6f0249c9f8538452d599e9ea938b2d57a9083e728c8f9d1c259871cc0f32c4f01c725692dd5e8270f0f67d84335593bdfe5ae31a54f117b1b84 WHIRLPOOL fc28fce46493e7915dee7be64e68b562a3a6d3a4452a3a7de82596be1dc52d8cd8ad82f364fa6425ea90fc0f36780d28fc23dd91a6866a7f6e53bcf2d170fe1b
diff --git a/dev-lang/erlang/erlang-18.3.ebuild b/dev-lang/erlang/erlang-18.3.ebuild
deleted file mode 100644
index 70bcb521e11b..000000000000
--- a/dev-lang/erlang/erlang-18.3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER="3.0"
-
-inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="http://www.erlang.org/"
-SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
-	http://erlang.org/download/otp_doc_man_${PV}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
-	sctp? ( net-misc/lksctp-tools )
-	tk? ( dev-lang/tk )"
-
-S="${WORKDIR}/otp_src_${PV}"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	if use halfword ; then
-		use amd64 || die "halfword support is limited to amd64"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/18.2.1-wx3.0.patch
-
-	use odbc || sed -i 's: odbc : :' lib/Makefile
-
-	# bug 263129, don't ignore LDFLAGS, reported upstream
-	sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
-
-	# don't ignore LDFLAGS, reported upstream
-	sed -e 's:LDFLAGS =  \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
-
-	if ! use wxwidgets; then
-		sed -i 's: wx : :' lib/Makefile
-		rm -rf lib/wx
-	fi
-
-	# Nasty workaround, reported upstream
-	cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
-
-	# bug 383697
-	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
-
-	cd erts && mv configure.in configure.ac && eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && need-wxwidgets unicode
-	use java || export JAVAC=false
-
-	econf \
-		--enable-threads \
-		$(use_enable sctp) \
-		$(use_enable systemd) \
-		$(use_enable halfword halfword-emulator) \
-		$(use_enable hipe) \
-		$(use_with ssl ssl "${EPREFIX}"/usr) \
-		$(use_enable ssl dynamic-ssl-lib) \
-		$(use_enable kpoll kernel-poll) \
-		$(use_enable smp smp-support) \
-		$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
-		$(use x64-macos && echo "--enable-darwin-64bit")
-}
-
-src_compile() {
-	use java || export JAVAC=false
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs
-		elisp-compile *.el
-		popd
-	fi
-}
-
-extract_version() {
-	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
-	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
-	local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
-	local ERL_ERTS_VER=$(extract_version erts VSN)
-
-	emake INSTALL_PREFIX="${D}" install
-	dodoc AUTHORS README.md
-
-	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
-	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
-	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
-	dosym \
-		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
-		/usr/bin/erl_call
-	dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
-	use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${ERL_LIBDIR}/Install"
-
-	for i in "${WORKDIR}"/man/man* ; do
-		dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
-	done
-	for file in "${WORKDIR}"/man/man*/*.[1-9]; do
-		# doman sucks so we can't use it
-		cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
-	done
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	dodir /etc/env.d/
-	echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
-
-	if use doc ; then
-		dohtml -A README,erl,hrl,c,h,kwc,info -r \
-			"${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
-	fi
-
-	if use emacs ; then
-		pushd "${S}"
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
-		elisp-site-file-install "${T}"/${SITEFILE}
-		popd
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index d4a1337a2e12..9da736baffef 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -4,7 +4,6 @@
  <!-- maintainer-needed -->
  <use>
     <flag name="hipe">HIgh Performance Erlang extension</flag>
-    <flag name="halfword">Enable halfword emulator</flag>
     <flag name="kpoll">Enable kernel polling support</flag>
     <flag name="compat-ethread">Enable compatibility with pre-pentium 4 CPUs in the ethread library.</flag>
     <flag name="dirty-schedulers">Enable dirty schedulers</flag>
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index d9697c404bbb..fb45ddd2f1d1 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -23,7 +23,7 @@ DIST python-gentoo-patches-3.4.6-0.tar.xz 11728 SHA256 93e7c8487deefc36c612403fb
 DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 SHA256 30c9dbcd5c11ed025b9d8dd201da84c5b9f9756f9b6ba77ccaebc6b79a91e320 SHA512 d395a87695f700598026038d6929ea5038abd7d494294037a4dfa02d5262203dbbaa6ae258a5a7f35ff5542f6266dcf69cc0b9c3df2a047cd2f6699a87e182ec WHIRLPOOL 2191dc89805c1bc11d125005a5c5dd0e5fe635eb0a3d6698bef8b55f54741edc3b3e2588bb21f5eda517963489c15296cd5fd265c8a548d78be6093698e6b002
 DIST python-gentoo-patches-3.6.2-0.tar.xz 10744 SHA256 56729f9848557c52361c71404e5583368f6a0e93b5b6c2e643b59cb079e253d9 SHA512 2aac1700c541202aa4f43bff4cb521b996d52ab350133318abaddb43f4b6e20548f37de472ace8024ef325ebf63fdfff0d43f8aa1f717d3c56f974b7aa1764e3 WHIRLPOOL 90d1f12bee812f350ca0330a97290ce0d5c5fa9ccd816441944f042ef561d9023f4b79239f6d559f38a486fea458e48bf11d33d5bd6fa605875b686a2a845bd1
 EBUILD python-2.7.12.ebuild 10750 SHA256 097322c05e8ce3e749f15eded01b7dbcc8b198995dae192d702b86ca95e488fa SHA512 31b6427107ceaa3309b29bba84819f2e1695b5911904de0138767be78a0ee7f02234d5956b1802259ebdbbc726c6ac7de0c11ffddcecd913c2607696528430db WHIRLPOOL 4a4b7420478cdc1738bc2150f3133eddb5a0ef338de33dcbcfad3f92fac354e1adb4ec12d8f32a6015c19e63d8270880a4befeab53ebccccc4714be79755cbd3
-EBUILD python-2.7.14.ebuild 10761 SHA256 ff30ecb24f5aa926d4e2ff4967a6ab7a1c52ba70e63e40612cc0f712115d2c70 SHA512 76fb1f04360dd1e481b7148dd1da0325afe38678d7188d968a3d360b35ab2b00c053e128fee9b4ccd1c919fc4f551e21b533a8ec9cce6133edbcde1d8f4b4915 WHIRLPOOL 2b1c5925056901f288caf53dc198fb32a80a11aa7309fe0edaf89304b31615e844a68999efcbad26fef0f10ca23e7892696d81aba2c00dd18b66e9da7c2dcdcf
+EBUILD python-2.7.14.ebuild 10760 SHA256 29309cb8ec741f77c628e81538e1957f5df7ab01610dfd6eabfb96970b6dde8e SHA512 73b638bb282e813737321bad8174c6ce3cd22a102212a17dfd52279eaa2cb2719ae1de793cfada3812310c48931d4bcca65e662b7400d9cfe1db7c3641327239 WHIRLPOOL 65afd5094b2c3ee926b0fdde96f32c3df7becfd370247a6e016c241eae9207cd4b23b5920827f46fb220db412f77b13e170fe780f430ef96da50c952f764749e
 EBUILD python-3.4.5.ebuild 10547 SHA256 1f15b603ba833f9687f1e16a3be17d5fa1a25ca618c82f2837631d83f43ef9d8 SHA512 7b988edc2b962476ec8f4c406fae0fdb0658725840b9ba261d5c1975da4cfe42472bb21d6386aa693cf376ac535b2f6a04187449fad22299a2f6d9a5f9fdb690 WHIRLPOOL 528ea8f037ce16a6d53425d3290a5bf33bc6e066c911370b0c069bcc1025815d0f1bfff2ccfd6353e7622eb717c375773d9f9f99898a86102a0ef3a1616d714d
 EBUILD python-3.4.6.ebuild 10560 SHA256 d21dc79dc6e288177954ff528b0b5858b712a5eb84a27bf57f2cee7a1181bac9 SHA512 f16c395689916cc3d7b840343732de2fb4dfb62b996677e12ae8b50dbf95dd0e385c86f3a5e4049964d1ab67121556f7309bfddaad15b9e346dd3e9235813528 WHIRLPOOL 9ade13d473353932d4ee96b52ee90f10bcd4937f45625b37134723261861ff7e54d7154b2ee019934a304d14a7bbe63db2707b70712c29942bbe1bb6d15b9315
 EBUILD python-3.5.4.ebuild 10617 SHA256 d2f411319d192aa7f21ab463dee34fbb617f14f2d2a3dbe845505ccf78a5dd9c SHA512 3b2a4a97b49ff5bb91864a22db922eb73aea44bb587e6f915781acecc69805a9c4bbdf01b31a66089b50acc8e6ff3b07d9f3f1959428d4d4e0ae19960b3ae1ff WHIRLPOOL bac81ca361713675b339a3b9769a9e1f9167a136a4dc5cb73bfed4042196cf4a3d4a3180f5c16816a2a13e833d97da709fce6232f37e3bdde931c32a96898e02
diff --git a/dev-lang/python/python-2.7.14.ebuild b/dev-lang/python/python-2.7.14.ebuild
index 587a661ce691..e5ae740a559e 100644
--- a/dev-lang/python/python-2.7.14.ebuild
+++ b/dev-lang/python/python-2.7.14.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.