gentoo resync : 02.04.2018

23 files changed, 239 insertions, 166 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d9cea6b1c949..1573dc634447 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index bb3138fe0cba..5b4fceb6014e 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,4 +1,7 @@
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
+DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
+DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
 EBUILD bitcoin-tx-0.15.1.ebuild 2470 BLAKE2B 0beaf2e85ddbe60e53efed0fcea6877b9799695fac06da2dad962939a48d1a2bff1f530f1bea92799d3a8001e353cb0f08804d827bc145bca602c503eaadf42e SHA512 aba586d5ef584d1d060668a97117e9602ae1a1626b4e867f42f1a58be918678fece96fdb504b96e04317d3ade34382799100a769e00e5057ebd6f8bc738ee888
+EBUILD bitcoin-tx-0.16.0.ebuild 2432 BLAKE2B ed1721e555bcfa9490b7291e9d9dd0e901ec713ecf7a1316a930c13f337076ca27a0757afd562776a124a2553e3690a383884e850aa1156e2f457681ef4f60df SHA512 fb46d29926d4c7a1058a5452f36087c27d916608e853beb25ae79e13ea38bbd70842467a22a2170a1c73c0f1b1edc40c9f93e5e1643d5c96db9571a07973eee3
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.16.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.16.0.ebuild
new file mode 100644
index 000000000000..e0f97bebbc18
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.16.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991"
+KNOTS_PV="${PV}.knots20180322"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	dev-libs/univalue:=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-asm
+		--without-qtdbus
+		--without-libevent
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-tx
+		--disable-util-cli
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index bcc10da917e9..38c176a29822 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,10 +1,8 @@
-DIST debootstrap_1.0.87.tar.gz 65875 BLAKE2B dcbd613a3144320377f1f87ce19dc6de51210af3eb2f7f680cf1122d62dce2c4b5a398f272dbbf9a9795863e8b2c996e645002584fb533ae49e8e5b3a91ed1a2 SHA512 a36d566292f25093e0367a912f262e95036e355a3f4872a5b957cff53999f4491cc30d7d65a08c31e68f98d75c0a5229b88681895720ff9a610d5fffe4565060
 DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
-DIST debootstrap_1.0.92.tar.gz 70042 BLAKE2B d2e42f876c1bcc03d6159f1bbedaa26fece48d11cc847315711c2e89b4d313d98e7394515a319cda0f1fd857965878227862fd5255b50d6e0ccd433c7002f6eb SHA512 42d6cdeb1efbe95d9215522648d87165326ae1b5a024608abd476a6b3889c8c04420a0f29f5eb9cfd2e57adb4aa57a606519b09e356d0442cd4a4a0f6f45f656
 DIST debootstrap_1.0.93.tar.gz 70695 BLAKE2B e0d5747dce7e2c45f5aec271b3a6f1e004ae19e58747abaa10d258f4e16383d305da28aad3a72c51e8ea513ffc15f61980ff27e141de69af5e259572b1afd089 SHA512 c5947a0aafd8f526236d98fe3da3374ef02a69b089844c89a3f5bb5f991fa29d8c2a4ecdbbc84a69a85eca242c628cd592c22e59f444b65c581b8a70d60a3f01
+DIST debootstrap_1.0.95.tar.gz 68631 BLAKE2B e102be7f263426506c5896b50f34c918d76d265e31eaac3f85b0471e6bfede598ef7ffbaaae726d03017b4bd94d482d4267ce02a67226e310687e8c70f88fe6c SHA512 cf2c32430325b19c61de6ef782d7df68a740812faf5f464d837b5b612b9ba0539f8c12876ce23ba20cc1aa23908eb4f45ca602798ee0a6eacf7489c45c5dc7cc
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
-EBUILD debootstrap-1.0.87.ebuild 1174 BLAKE2B 61c6b552e68c03898c8cac6d7fa04d7f93dfb12c9967fc01016c0880e92894e23802821c393846284270dc0a6503487d22c0dc02d32af44a370ee51b808c7df5 SHA512 61168ab5fac341d00a9d58cffb56e3912bfd56b4ff7fc1c3fae945edc6618e582d49c1233082b4e2750849607919b724789bef2a242b837dbf766b288061a16a
-EBUILD debootstrap-1.0.89.ebuild 1194 BLAKE2B 42acc53010fc9bab8907b45cb520ec3e567be929f4031dcc5d261e7798cdb529fbaa326e31efe7f8ed15649441162e4088413dad533f426cdd526fde87e3fa89 SHA512 03b7ac7055a6547255ebb433a62c1ce6eb33fe540764cdef5da631e66341dca64445f22b4956ac209dd38c5ca1daf1d4976c4bc3785747c6f50b5cdc60a28c21
-EBUILD debootstrap-1.0.92.ebuild 1183 BLAKE2B c1eca7b9514446790ab5902b6afdd82db051adddc6b3f0c3c6192685193623f7440207637acb6f1227dd723d5cc51da314f2f63d847e014e13cbe530c3d6a706 SHA512 c4ddb7e092b5859048f0fceeb4d68ccb119a8e5bc48f691eed82163a83193255a33b77e5e3d8bb5f0b11bca400d668aac45b5ced70a1ef3e9aeaa83c210ed6ba
+EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
 EBUILD debootstrap-1.0.93.ebuild 1201 BLAKE2B 2dfde0fb57862c70df7e8db42dee07cc838bedffd962ae3292b12188dabc76f07fc2b7dec8d193b681023bd5341e49a3815b601ef466507f97caf377661c52f7 SHA512 387cd06ce6abdc06eac71d92b74ad0375b33f2455483a70bb4a75649f9f6536fdbbea5acddba36eab865750d40cb4bfe8921dc1b1b96db1d897ec7fd917287d0
+EBUILD debootstrap-1.0.95.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.87.ebuild b/dev-util/debootstrap/debootstrap-1.0.87.ebuild
deleted file mode 100644
index 46bf8b22850c..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.87.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring (--keyring=K), please"
-		elog "install app-crypt/gnupg"
-	fi
-
-	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
-		elog "To check Release files from Debian or Ubuntu, please install"
-		elog " app-crypt/debian-archive-keyring or"
-		elog " app-crypt/ubuntu-keyring as required"
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.89.ebuild b/dev-util/debootstrap/debootstrap-1.0.89.ebuild
index 406c0e4a96d7..bcc76a47559d 100644
--- a/dev-util/debootstrap/debootstrap-1.0.89.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.89.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/debootstrap/debootstrap-1.0.92.ebuild b/dev-util/debootstrap/debootstrap-1.0.95.ebuild
index fc955a4bad4e..93ffd5d2d1aa 100644
--- a/dev-util/debootstrap/debootstrap-1.0.92.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.95.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,6 @@ RDEPEND="
 	net-misc/wget
 	sys-devel/binutils
 "
-
 DOCS=( TODO debian/changelog )
 
 src_unpack() {
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 5ab720106519..6fe67bd5a6e9 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,9 +1,7 @@
-DIST dialog-1.3-20160828.tgz 501960 BLAKE2B a9ec14a56dfa165345b5cc60e2f91b3da6c3be54b5ca8a89798cf4bcc92a95a586b17ad6435cedcc330c9bb001203e6c7b4f3a302d31591fe890c4a2d5b622d0 SHA512 aa0329578c8b0580e52b1f6aad5c7179bc519c3791cf115b035e28f25e5f48d7a626faa1a322b81365646018a2f8b09f67f4df0629899b50aa5ce7190b022113
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
 DIST dialog-1.3-20170509.tgz 509135 BLAKE2B 30f443953701f79db86a317d3c1a3a7743685388cf432a4d48e10f0df5181207e0a182f96566cd868d9ee5db8296f362e57f40a8e58c99d3b372eb967bc56ebe SHA512 dd3fe2041a15dd344ea39a1ba111d3b26daca1cda91a4e82f1223385a49cdf3de15f11129366a20c5a24b16b5301f215543850a390d70d0559f98247bbd49a56
 DIST dialog_1.3-20171209.orig.tar.gz 511503 BLAKE2B db633f882cce8a0ecd1446c26b305f5567bcdc0fb8e073ff3a443fbf56662638685578040ecd21220192c069899998f587aa04db8185074b4c8af957df77c49c SHA512 0355578bc64e2c75a2aae3ae83aff62eae60556a2890d50a72988efa76b82055755922bc1156a92370d773524865e76b8a0ddcde77fb6e6b5774c987fc22dee8
-EBUILD dialog-1.3.20160828.ebuild 1278 BLAKE2B bd9847da9f7f35cdccc3639ffe919e1dd4265ba495f5a12fb1062b10cf2214309cd84fbc9b42208e4585d6cd2688628ff042c23b239513c64a3417408b03a943 SHA512 fe6672bf50566bab89d8a3c8938e647961fedc0f00ab1f33fe5d02b1973fbccea9c7bf258f96625f115dd4805aa3f8c6d26977547d49c32018b2e73881fe581a
-EBUILD dialog-1.3.20170131.ebuild 1282 BLAKE2B 5c4f7825d15cd72dfe9dd6c8d1f52da7260f54ed1ef0c54c08be884a8ce9fa094391436a47091a0fea52ce607268b1da51b167c905dd98698b8a7cc17c017ec9 SHA512 9ec24863c2597b4937a575b7e8d6ff6e1bdd1b54d8fd04b9382fa780a97765ab50dce65e469716052efd5800faf4d84c02397ff1e3cc81f1dde3f454a2bf41b4
+EBUILD dialog-1.3.20170131.ebuild 1281 BLAKE2B 03cc5e1966799eb10c9f3638bf2044ae3c433b6c1869cea89e9cfea2ff6d6cf8053f1138a721b14eb97db15a8b84ab6348552ab07e1624350d002c72fd79c924 SHA512 24a9feef1da4d2550c73d48d7a0bb02fa34a89c722672d0bd4c2ecab1e4a96f4fa4084ce79c32cecc928c468af8d414554dc244b66900d13be825625a8a6a287
 EBUILD dialog-1.3.20170509.ebuild 1290 BLAKE2B a9cc5c942135ea7ddede6b99f89a2b809b845a96bc6048d079e407a7cde93824a24795b9b3a0054cccdc541dee503322dea52d5fab87feacd7de55c206839263 SHA512 d0446c58fa792ad28393ee9946b866a7b45280e2aaa8d63add0f8c53a68229eaef793d9b65822edc1de13e354476c12a2bbbffa9aafe6c06adfb92648a520beb
 EBUILD dialog-1.3.20171209.ebuild 1350 BLAKE2B a2ae71b554dc8f96da4422d00ffbb49cf3af2456a58e97e8151db89ff16903200108cee08da78fa2e8dab1b36909c2222ad4a6336beba1f4010bdf6d7266f790 SHA512 52522ede770c6101897f8eecc5b0c9ed82c5ddab01a092cde57f7e08052e31188386eae7fa0a9044317b5d25c63502b69aa09dfa535780473a89888f1342ad47
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20160828.ebuild b/dev-util/dialog/dialog-1.3.20160828.ebuild
deleted file mode 100644
index cee0aa1f7d4a..000000000000
--- a/dev-util/dialog/dialog-1.3.20160828.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 2 '-')"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="http://invisible-island.net/dialog/dialog.html"
-SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.2-r5:=[unicode?]
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	!minimal? ( sys-devel/libtool )
-	!<=sys-freebsd/freebsd-contrib-8.9999
-"
-
-src_prepare() {
-	default
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-rpath-hack \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts=$(usex static-libs '' '-shared') \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	prune_libtool_files
-}
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index c73170b22412..0267085e358b 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0/14"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
index 2304e9a7dbba..ce8245568f3a 100644
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@@ -1,7 +1,5 @@
-DIST hadolint-1.3.0.tar.gz 27014 BLAKE2B 9142319c8c275e78890ebaa002817a6d9b6beb5df0caf48000276d4f4fc6df780f6474790dae83c2d45074d5752b9dd482cc9b3266e4f404256144b53719db72 SHA512 6ac01e354849336375efba67870ba655e14424919d6c8d3c40ee246c7ddf1b2946a5d8a74d8bbaba45a2827895f9a18f6dbc042e41b2c44f97be3c615546f27c
-DIST hadolint-1.4.0.tar.gz 28384 BLAKE2B ee5fb556d99375b0628dd8eade076e98899301a122cec9cda1b1198da150b7a5ea1bae84e6550ab05efe0d079e926a7e16f76d873203be3e03ca428f1201a6d9 SHA512 a91c72bf08f98696ac7267268f10293837da402d3d71e042d9bde69affdbc7d0c42bcbd30756a84bbb021d100f1a200362c9fc28c5fbba87903b4cbf695931d2
 DIST hadolint-1.5.0.tar.gz 31002 BLAKE2B 889885192f8ae12c468b90923948970d617bb5dc0156efa615e8ef750b3940b66d84215a21d0dca11ee7176f12b32c47a35a763035c9c2023bb8dc83b2b0af69 SHA512 19e246d82670e27751729394ba73ef03260525eedb0dbe26a605dd2c30e95386bafb85f9063a94d3a3e8b47fb05c248bdd6fda0ef9cf95285b1ec0ef54ad6d15
-EBUILD hadolint-1.3.0.ebuild 972 BLAKE2B f8e845180b0284f5b48a990fa425cfed9c6f8cac0200e90b068d48d37f01edced97555d907aaa9443e5145d58c94769b00891f027e6de6600e336d42eec25068 SHA512 59e7a23c7210275a86a6aec7a550958ed14830a7bf5329ceee4cafdbf2a834dae26165f5d6e36fc34ae7f3259e85badb60a4d62b819a875f10a780cd964525c2
-EBUILD hadolint-1.4.0.ebuild 972 BLAKE2B f8e845180b0284f5b48a990fa425cfed9c6f8cac0200e90b068d48d37f01edced97555d907aaa9443e5145d58c94769b00891f027e6de6600e336d42eec25068 SHA512 59e7a23c7210275a86a6aec7a550958ed14830a7bf5329ceee4cafdbf2a834dae26165f5d6e36fc34ae7f3259e85badb60a4d62b819a875f10a780cd964525c2
+DIST hadolint-1.6.1.tar.gz 32674 BLAKE2B b7b3bc664848806d2316053724a91d0276e8af8c0324b31c2b3c2ae48b247e2092473170bc0f8ffcd76cf3b91e3c17e0e9b7b5f47c1eb416d23d01b29b454182 SHA512 ed79861d0938327ebeac8a8162d3a76257a22829d6188512bb43d5312327e39f31ff960d85e7d5c367a377c0a21e7df637e6d40448415752f132cf385ab8bfa2
 EBUILD hadolint-1.5.0.ebuild 1064 BLAKE2B a4001c12da3c75c033a7efb686005e9fc7fdbf532dad9bc36db569371c82a604b4563cd24b7c2130f13ccbd7612ae344ae8c50443d7828d89156de04d00c7658 SHA512 9934c3ac41e0764c87b5ea4ca0c88853751662a84a7f24e5aa6357e92edb6cb8ee23e6416cd67ef400897f39bcbb9f47ea4802de6b8884def844db8562b6a88c
+EBUILD hadolint-1.6.1.ebuild 1053 BLAKE2B 80699fb7ccbb094072eb3ba83cb0ee6e591e3092310cfd3e03d504eb63ffefdb4102eb0cff0ba83a61af4ea5ff4734e3a55e50d2cb483d283a7968092ddd415c SHA512 4c3b68251cabb19fa184828824e2c6dc9861dc84cdd3300f689583cb4f19dad3b5a24e31df55e81163d551189485b8d1edec4480827692c0db932e4207059cd7
 MISC metadata.xml 364 BLAKE2B 960f838518131ef8088bd574862e5ee91f7d57f7b6925718a1249d46ffcb84a70200a160915284073e24b54fd8fdbc3a479cac5d91c03d5ddeb1b55c570f995f SHA512 2d359c79cbc3ed17c447453c06cf92026edbbcd3da98108b560b25c9d69b8f576a9645ddeef02e05c3e492729a9c7a78746a69aac319213b32d5037c2be23247
diff --git a/dev-util/hadolint/hadolint-1.3.0.ebuild b/dev-util/hadolint/hadolint-1.3.0.ebuild
deleted file mode 100644
index 2f335d90eea9..000000000000
--- a/dev-util/hadolint/hadolint-1.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile Linter JavaScript API"
-HOMEPAGE="https://github.com/hadolint/hadolint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-2.0.0:=[profile?]
-	<=dev-haskell/optparse-applicative-0.14.0.0:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-	>=dev-util/shellcheck-0.4.7:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
-	default
-	sed -i -e "s/-static//" ${PN}.cabal || die
-}
diff --git a/dev-util/hadolint/hadolint-1.4.0.ebuild b/dev-util/hadolint/hadolint-1.6.1.ebuild
index 2f335d90eea9..9a011ff9f34e 100644
--- a/dev-util/hadolint/hadolint-1.4.0.ebuild
+++ b/dev-util/hadolint/hadolint-1.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-# ebuild generated by hackport 0.5.4
+# ebuild generated by hackport 0.5.5
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -17,11 +17,14 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-2.0.0:=[profile?]
-	<=dev-haskell/optparse-applicative-0.14.0.0:=[profile?]
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/dlist:=[profile?]
+	>=dev-haskell/gitrev-1.3.1:=[profile?]
+	>=dev-haskell/language-docker-3.0.0:=[profile?]
+	dev-haskell/optparse-applicative:=[profile?]
 	>=dev-haskell/parsec-3.1:=[profile?]
 	>=dev-haskell/split-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
 	dev-haskell/yaml:=[profile?]
 	>=dev-lang/ghc-8.0.2:=
 	>=dev-util/shellcheck-0.4.7:=[profile?]
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 52bc8f033588..b5df9ccd132d 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
 DIST meson-0.44.1.tar.gz 1136337 BLAKE2B 7391776d2f480f43c6cf0bfae3665c16a61c4a28fc4310dc8659ab4165ef76ad1729a9daf645330ea213aeb59e5ba9d991d021d1ad620f6673cebfd64b085d93 SHA512 3c350d1752ae4463ec47060e051d79cc0855385e9552deff34fad8431175fb5d0f04b51a242f8f8f737726d06e504339d6b02a5aa9558ee673fb867dbb4e5b2d
 DIST meson-0.45.1.tar.gz 1163287 BLAKE2B 820ab763193322c75ebf3a79cd38f49f9fa06f9645f382961eddab9bb088263f5ecc603d3ba6db9e038db1ea150d6897dc202bad24ff985ab1ef2dea3f08b724 SHA512 704731aae28ba5fe4c2040464d42489cfc1946c95c39e28eef170ba5ab929b8672c782ed18798528b59aeb38abd23e4930f38e38f1e8c45f1ccf96071b097731
 EBUILD meson-0.44.1.ebuild 923 BLAKE2B bd78fd51af575678067d4fad1c4c240fb4582607ad1dd0eb9bc2c114ac61942956bc93b2b419bbf95edc0c6c7ba4326833aa01a39036a67bf0ff504e4b9054a5 SHA512 3b69e8a6d79476bc93185865c6795b239eb8c4b91d6aab48b8fe6dfb14288e7c53b59ec2418795270f1901debe0ebdcf1167e5817bffb37b62cb6f270df9a4a9
-EBUILD meson-0.45.1.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
+EBUILD meson-0.45.1.ebuild 920 BLAKE2B 450e88f485be98d7a0939de1b0c35f95cc1a173002d891f4fa24a3eff3dc3c919bc1b80808dd375c7fd9d5cd8f28ae41cdcef62290144f6397a891bfe276c38a SHA512 59436c1ff03915271474cb55369128a534c730a6c400af975f5c8c101c128e3c12cf94e028942404cf19c8468e3c23a2baaf779e198f04d24d365a9cb84a3a4d
 EBUILD meson-9999.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.45.1.ebuild b/dev-util/meson/meson-0.45.1.ebuild
index 37aab5a3b433..d6860a61dcad 100644
--- a/dev-util/meson/meson-0.45.1.ebuild
+++ b/dev-util/meson/meson-0.45.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 7fee0f232e84..b635fe11ec10 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -2,7 +2,9 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 DIST pycharm-community-2017.3.3.tar.gz 279677180 BLAKE2B 373276332c918a325290e9ca0fa37ac7512025e0c0ee8149c3c08321b0477a0a5263fc24dece443c471f2a96a1b147153b0952466e374acf62389e1c49a1f114 SHA512 d4e9dffa7d2abef825fdbe7ce2665e2d249b18d81f7dab5051a0a2fda7896e5df7cce16e19518225dd23205c346df8fc5c5b3cb39280886004340cba60aeacd4
 DIST pycharm-community-2017.3.4.tar.gz 279847033 BLAKE2B 451540aae6434f39a94a664d4aa8747071c9c045793a7d445bf1acf4c0412309448b9e05b01c7e86d5b6915d144cb5175956981597d24064b2a7f934bd043bf3 SHA512 0478ca55a0dbd45b54c3d1af45a6cfdc562f0a863e3fe09922421ed121e22f5182c71fbc05b0e9fe7a8e92b197f6ad473da34b30b867297690d7bd9df5fda730
 DIST pycharm-community-2017.3.tar.gz 282451011 BLAKE2B 250265d7cb0cb3ba94733c9404f6bc1c6e4f62207721011e9eec65780f9e4c92148626065051a1e875124d013cff488c8d7ab9861c094bf4a33c0b8596e717e9 SHA512 4e835f671971171966f52a4219f47fda2675b2fcf38f0f91ff90b1aa00508ed3b5445a488750c6e9d82515780e9f190201da918230c0b80d869d6b16ab352cc6
-EBUILD pycharm-community-2017.3.3.ebuild 1048 BLAKE2B 3c4cffd33ec2c9251d572b22770dd0e6e166373546d5b3712fe98bb9d86aa5200711fee48eaf49e877d2e3bfb94f264c7a02a9a7c388de271717132ccfa86f84 SHA512 1fbdf07d28786955d015e1005c5652c6de63e9d4f548fcf37cd6f18f18cbd0690e7e590003db7fd073595dbcdf2121f92a2b3e7563428b6f8bd14e480891171f
+DIST pycharm-community-2018.1.tar.gz 264891672 BLAKE2B 4fc85276f1e214ac4f03c11593dfa4e9d50bdca043192816c5bd4f768df436c83ec723683315e8b3558a7129542e371c47945e531d977567e8d87f78b412add4 SHA512 41090a3973a19a53440b68625a1dd448e5c92b07813ab8497478867a06d0b847668db2e9bb179caa967fdaac914073a43fa6db5ec371cc17c491f9614a2ce600
+EBUILD pycharm-community-2017.3.3.ebuild 1047 BLAKE2B 9500085aa99163f585d1e2df67719c37195db77ff3adec2b01941d113b9f21149313bd5a3ecc55b963077fe03a60bae49d726030ca8bc0e527c20782a5bafcdf SHA512 c548ab7f7b2f6cfa86cabf294da532c51c1acf5a942f4421223dcd224ee5e696ead0c2775c3c9f84325d07169d67773ba4ce2e5a47b7ee06f7c22cf7bf649186
 EBUILD pycharm-community-2017.3.4.ebuild 1048 BLAKE2B 3c4cffd33ec2c9251d572b22770dd0e6e166373546d5b3712fe98bb9d86aa5200711fee48eaf49e877d2e3bfb94f264c7a02a9a7c388de271717132ccfa86f84 SHA512 1fbdf07d28786955d015e1005c5652c6de63e9d4f548fcf37cd6f18f18cbd0690e7e590003db7fd073595dbcdf2121f92a2b3e7563428b6f8bd14e480891171f
 EBUILD pycharm-community-2017.3.ebuild 1094 BLAKE2B 251c4ba36753fc2cf04b36835e99d8f1ad190693377701d673e3ca4189d58802e7781d7d905800964310f0b269d9d63fdd90201c50269e87223af5330cec6b1c SHA512 20468f06fac62a49a9a950276aaed0105ad839d405230d1040f9bea6ec0ce5f68d53eb7b0d291a340bac008d4778be87287c36e270612ef6e42fd2b5e8a43f6f
+EBUILD pycharm-community-2018.1.ebuild 1048 BLAKE2B 3c4cffd33ec2c9251d572b22770dd0e6e166373546d5b3712fe98bb9d86aa5200711fee48eaf49e877d2e3bfb94f264c7a02a9a7c388de271717132ccfa86f84 SHA512 1fbdf07d28786955d015e1005c5652c6de63e9d4f548fcf37cd6f18f18cbd0690e7e590003db7fd073595dbcdf2121f92a2b3e7563428b6f8bd14e480891171f
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild b/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
index 4cba69da5984..4790ccf65f20 100644
--- a/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8"
 
diff --git a/dev-util/pycharm-community/pycharm-community-2018.1.ebuild b/dev-util/pycharm-community/pycharm-community-2018.1.ebuild
new file mode 100644
index 000000000000..4cba69da5984
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2018.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 2dc5587c5c5b..2c58fede46f1 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -2,7 +2,9 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 DIST pycharm-professional-2017.3.3.tar.gz 356063034 BLAKE2B afe45081582983c05590602ed10b66ee687bd3ef4995bb0ae0404dddefe795ff8e93af2ac384ffa37600f2eebc882fa1bc6de8b6831341957ea69bda4e4632c3 SHA512 1e6d9fc1de13ecea5f4a2cf5bd9f2d7116a40802c24cf21ac731183d4b20aab480e34e039f1ca2fa36b4d873c85204febea975392d73da5a32f239037c7bd59e
 DIST pycharm-professional-2017.3.4.tar.gz 356283723 BLAKE2B 3d2abed57f0459e49034a6b081c69008628ec8a16322ce90e15e0a42c670554ea4eca66b73279ea0f9aeac116dc86e8d52590861d712ccdf93d2be31c2d1211e SHA512 8adc3c46b50c4ed895d0d40b0c235a047fcac7e4ab5262aa88ba69deffa9402b652bc69ec1ee3d7682900698d14bb2ecb7f82a89f998979c009fcadb98ef4517
 DIST pycharm-professional-2017.3.tar.gz 358504339 BLAKE2B 4ac1eb3feed289326a0122e3e4f869d7be740db1fd8d1c5f5c80400a8d8aa2daa444d4fa279c33865aecec4af4a28999e10b100714a44aa1d772d7f598ac05f4 SHA512 b7a085eda5d3e4ca8a918009f80cd7d90a281f2e522718211b4813f199a9c3a8f38f9742600336c09db479691c789d852ddc1d99e9ee2b11876e85728ae51b44
-EBUILD pycharm-professional-2017.3.3.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
+DIST pycharm-professional-2018.1.tar.gz 343431274 BLAKE2B b88ccc821a2e7d35bc2d19582c69493f23bd766c338c2b2964cc0c4993d308783245daf9d6a09fae5206c0d0eee7e1048fb265968b51f614ca4dc9c55c58a2c7 SHA512 a32069fd846e328caa1c0acae3821f73ce98f5268ad934e276adca5ff39371b017f2ce1246e808692fdce8d174f8191fd7c12ef893d0976262059df25e58f3c6
+EBUILD pycharm-professional-2017.3.3.ebuild 1208 BLAKE2B 899161dba5d95d032bb92292cf7a79bb661b5e869f32b8a5bf5d902784d9537e83d4616201d2567961e3f646b513a16cb13307fc75738ac942d82ed2ea7b7308 SHA512 090f6c1fc3db9b8106c249f8b979c9dbc39940e1c998b00fc9d30c1091396d1caedd0a67051e9062b326eeb5875f2f103cf9b4324f6d7d82dab8d27e2625adec
 EBUILD pycharm-professional-2017.3.4.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
 EBUILD pycharm-professional-2017.3.ebuild 1255 BLAKE2B 562fb3468298c372f2fd5d5492a8a882315d7159c7e743de76219b1e7f45989f186807495e07370c5b5d7e35f6c200eac5e73d567f5db754bab448c4dc57bd6f SHA512 908869fbce14f4d7c1b4dc44fc39f1c82eb11663d8a3164e684a2fff659c9eb15b87eb6e5e62befc5af73dc1a65f3fc0f5ea4a5baabfc5bf740f3fba91ad67ea
+EBUILD pycharm-professional-2018.1.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
index 5dc7e67e051f..b7c5d6db8f0e 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8
 	 dev-python/pip"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.1.ebuild
new file mode 100644
index 000000000000..5dc7e67e051f
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	 dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 2e46861e97ee..8534e6d799ee 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -8,6 +8,6 @@ DIST scons-3.0.0-user.html 1111001 BLAKE2B 99a4994b161522535386ea7c0b60755653e78
 DIST scons-3.0.0-user.pdf 2376928 BLAKE2B fed5b4b43f4ce387f6ed0a7ca9017e087ba9bd341bcf02e93c223f4fe1e60935b70dcee73e048e206ccc663bd9413231e05266656623c32d97536116e1a5db88 SHA512 826653a8d6700b8faab6e22451fbf0839b2d639db1492334fbcec39f224d19b2d076f49d6cb167c085e8285e4b7022329042d805066922c2edb20db3322816a4
 DIST scons-3.0.0.tar.gz 630418 BLAKE2B c700ebf316932993540c52735af5ae9a2044a35cf2a1c7324d213059f16e0cd45370432fa32b96fd2e4f328add97ff8d608f73da85ae0b952fd97ba0a727b876 SHA512 e52c31a21f8aab4bbb684a8770cbcb9eeef042d5c8c86ea2f4beb64ec0c50bc1ca4aa738a2bf92330bd26f8fa9589cb10314dc53defccc2825a5a13b01641b2d
 EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a464031395dd72e8f1311b703a398d9abb56eae9a67d4654529ec2fe06b8465f00fe83c442e251875dc53317 SHA512 69f7b513981e51bf547aad20f31af7ee98b77bb11bc10257499f92ea32d4a664cf83d77cabea81a56b068f2c18a40503567611e7ba78b987d4c6de1d52648b90
-EBUILD scons-2.5.1.ebuild 1722 BLAKE2B 19cd30ceb695f389bd3cfa65cbad2e7c0a9687497a6000ffb9ee8be4b9d9e2f74fabbcb156a1a6e0490c0adb9487893589c5b9e86cc0585269cc9103b3242519 SHA512 4f31826267af225c014870cbd6211147512b95f43a9094e80e5c4683adeda557c3767cda0eb18fcd78e849e41d47722335c4052e09f4331d9bbbb5feeb566e58
+EBUILD scons-2.5.1.ebuild 1721 BLAKE2B e388ff7e7b63273473dd8174762dc94091e236416c28d1886159a22c2c21b4ac589ca709adac4ab169bccfe6ad25ab0d7549cb481f798ead8a80c30002ec5fe2 SHA512 5f0cf2935d9ed30e8cf61b1bef72d3576f8be49bdd3ac9d6b63296afe2247cb5338101b95062b51fcd279de451bd2ea5616d944eb66f7af9acc5f029feb638cc
 EBUILD scons-3.0.0.ebuild 1745 BLAKE2B d70c095a6dc1b176b838d2f2b837f8c2ae10f91effaa66695161d2c5b318b5f7e9787cd692b8e3f382c9a1f9e44aa53e5ba1f058075be94fa9bfb513eb11d031 SHA512 f9431d9fde567661f8e3e3d101cda45be797ee2f24276c7d3b91a47bee6bf15222bfc61b213e56ac27ad18ad0038188b583f167aa85c626cc92e21fe0c593970
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild
index cf210a39b1c5..0770cb184db4 100644
--- a/dev-util/scons/scons-2.5.1.ebuild
+++ b/dev-util/scons/scons-2.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 #PATCHES=(  )