13 files changed, 306 insertions, 47 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index db3017c1371d..47e8a555c281 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 309b3b909c64..5addec7dc680 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,6 +1,4 @@
 AUX checkbashisms-2.15.9-command-vV.patch 1269 BLAKE2B 78225d721d72871dd5512f2adc3f2d6e12c6aef55c5b712f925ecd4555eb5ebc26b865f17ee02181f1b01aa22b4cee8ff66afbfbbc69e1b337c7a6bacf129dcc SHA512 7b7966b2c5fc672b0a83f7949076af536a56e910853374b2ee876ad5032f847bd87c7d10c7836d9699e2a4412709b02f5769685acd392e94704549de639ea995
-DIST devscripts_2.17.12.tar.xz 712676 BLAKE2B a0d04f042d5337ab89e5cdb7f16b4de306052e1f7517ed05ff7fab447d8425b44a37941e7672c69f36ce93b3c73c06d706bb6c0e8c0932d626789b0d141193f1 SHA512 21de10d8742c3f2c3c83fc2660ccb7aed112e78c7a7857de62c0fa1b84d7c03a9e488b60a291e5529e3c5632c3f5d206dc11e88ac133a7e84632e1885041e3c5
 DIST devscripts_2.18.2.tar.xz 729456 BLAKE2B f620edf67f67e84697677117294b9d8bc90db30fe1e228d5043179d1ae1e65f10f7299870bef3ff920312fd7103abd6c5f0296055776318640a3a9535ec006c7 SHA512 a68e9eccb5662b1ae0860b3f6cdc812a3105df83cd36f4b98b339ba1637a165f45b06acfb9dbadcf1055b65a4d5aa0780c1b921ed422ed1f0334735adadf4b6a
-EBUILD checkbashisms-2.17.12.ebuild 893 BLAKE2B b3c7bc34946290f64a7d4c42ab24f93cb6a3c991baedf308dcee394957f546b8e3ab4d6593c60ce54eb6d66d9fabe499b4a50e772bf8dfd675a04fccc637bcd2 SHA512 22d4192fc8910faab251ac0127eeff9be1a28d42ed849c0a8dc4963d0def30a7b398691016d74f853fdcb785885e4c7beb3c24e8f22441b45394163c405bb1ca
-EBUILD checkbashisms-2.18.2.ebuild 895 BLAKE2B 52481361dbca66b0c706e80bc264dd3a8a15f461819df7ccb188c46d17e3aeb0a5e2de6833912e846ac0e21eae3e857486def02a07b95bf28c0d93822fc11c43 SHA512 f0a1ce1e79e0a480c1d901863a834b177cdc48b1457512f7904b0ec8ca1313767971f75d1f8a466e08f1d22f38a47656a64c372956b430c5131a67d473e6f7d2
+EBUILD checkbashisms-2.18.2.ebuild 893 BLAKE2B b3c7bc34946290f64a7d4c42ab24f93cb6a3c991baedf308dcee394957f546b8e3ab4d6593c60ce54eb6d66d9fabe499b4a50e772bf8dfd675a04fccc637bcd2 SHA512 22d4192fc8910faab251ac0127eeff9be1a28d42ed849c0a8dc4963d0def30a7b398691016d74f853fdcb785885e4c7beb3c24e8f22441b45394163c405bb1ca
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.17.12.ebuild b/dev-util/checkbashisms/checkbashisms-2.17.12.ebuild
deleted file mode 100644
index bc30ea8cdf00..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.17.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.2.ebuild
index be58ae776f20..bc30ea8cdf00 100644
--- a/dev-util/checkbashisms/checkbashisms-2.18.2.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.18.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 1a0dfb63f6a4..fe835d0c0be2 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,5 +1,10 @@
 AUX codeblocks-16.01-gcc7.patch 1135 BLAKE2B ac57db38c781ecb7d8df0e05cad107c8a92ab205a52ff463959667b7dae18d2610ea222d80b68367d9772ded867e478325323e65c6b06cd748c5a7998511d265 SHA512 b9780f966ede4336bc49117a90a98c7131a4f49b48ce2c925d4b88d2c7d840ccf1aa00f5df022f6222d3da5e3aaf5ed1af391f2717f124a34c107a8c96dee4fb
+AUX codeblocks-17.12-nodebug.diff 611 BLAKE2B 03de6a604b0971e7b91702fd9a1f66aee6d87538177947762ce7b112bf6e81e75349c76415f1a18ac4ee0b41fa4f1257085af1031988c3346a45402b7bfebe73 SHA512 d5332803a0d9cbcbcafa5fa18d90bea07ff43d8ff93922d577b3b2dddc6349a7b01c9100f6198905d531e31edd0f5ba0b5a88db38df981c567644f8e7e11022a
+DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
 DIST codeblocks_16.01.tar.gz 20250097 BLAKE2B 7d3ede49b38ee3c58be30435d39ece38fd4f043a9b1cf0a3f53685ad93789ce650b5d8837f6f29f7bd73e150b527784321f7dcd3d94a767d80a8a3d4350e5905 SHA512 496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
+DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
 EBUILD codeblocks-16.01.ebuild 1003 BLAKE2B 1a5d584b2ad287cd02b6ad23260562c7f037fbd18ed8bc5fb3b733553bb79ac824f79fe344c85a1d4d4f26b6b5193c4daf7992cabd746064337b291ce9478d80 SHA512 5c5cce9c1d88989cf5ead2a51caa02e916fc08ba4085b8511ef310abb7eea8525aa13baa3feaad88f95caf279323ee0b4690f18b7b333cfc41cb3bd95844d78a
+EBUILD codeblocks-17.12-r300.ebuild 2014 BLAKE2B 6b99be334575d995d4537c192b90785c3628a6ee0c377957519d200ae7a931bea5e0ebd2cabed7d0fde9808bea95795d0fbd85c3417999197800db57c70be329 SHA512 a6bcd96a13095c3e31357d94cdd76fba0f7161120261750edbffd81b243b9323f089bb91a4929f317e79fde85c7579ef72fe5dcbd241a0cc7eef6dd385599b83
+EBUILD codeblocks-17.12.ebuild 2009 BLAKE2B a2266b73e5b75e95173240f01929146cb81d9313c570589899142c4631660bf214384fdbb73522bca1bf33d7a40cc0217eb5beb78d1b1998bf2e483ace970bdb SHA512 43d790abbd465566cf5aa18ca86133e7835c51643a570d23b43ac8df74e74a764079077e1e40c1a7b5d30c19d28cf4f9377f6b689f5618bac4e9e8539b57d132
 EBUILD codeblocks-9999.ebuild 1249 BLAKE2B e96be4c155ca8dd71b1b768d106076c36728ab5521418cb8ba722081485efbc4ebcffa95e535ee98e138ede0968ab59584a98bceb79c990b590a3f6f9efdc8d4 SHA512 a0a9d87c06df9f1dccd43fb009c4ac4261dcfcc99138193b3836d9a0e6ebeb4ef38180a3388774ffd84c17abacde95589c35e0febc425b07cbc75dbac9f9b3e6
-MISC metadata.xml 436 BLAKE2B 4a807f9ab3a6e9d0837f8972e286b6dea0a311e8ff32d1746bd688646441559a6fed92347024dee09f9bcf700e45362a014b7703fa270e02b2636f97dda894a6 SHA512 0ff3a17264a93d46efe1455778188ebd9f8bba8c9c0d7b5d6457d6c69d43db343d70f9b1f9ccfddb187ff3e827f4de05b1b632b3aafa4541b1f1f1bc20768aae
+MISC metadata.xml 673 BLAKE2B 2868f0b98e33bfa54b217038a440d01d7f289093a6d31873b33f9eb3570c9f83c57476d2aaeabfbbdc180ec00fbdb300ec68cbb45ee95ddf99b3ddf7e92681f6 SHA512 54996828105be8435499880af88e1bb48eb746787f4838e691ddf740c86c3ca84a09973a9925ff160308ba1a28a5e746f58d2d1b646f922a2949368dc3a016fc
diff --git a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
new file mode 100644
index 000000000000..3b627ef7a238
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
+
+DESCRIPTION="The open source, cross platform, free C++ IDE"
+HOMEPAGE="http://www.codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+RDEPEND="app-arch/zip
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	contrib? (
+		app-text/hunspell
+		dev-libs/boost:=
+		dev-libs/libgamin
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
+	"${WORKDIR}"/patches/
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# USE="contrib -fortran" setup:
+	use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
+	# USE="contrib fortran" setup:
+	use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+	# USE="-contrib fortran" setup:
+	use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
+
+	econf \
+		--with-wx-config="${WX_CONFIG}" \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable pch) \
+		${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
+		elog "The symbols browser is disabled due to it causing crashes."
+		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
+	fi
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/codeblocks/codeblocks-17.12.ebuild b/dev-util/codeblocks/codeblocks-17.12.ebuild
new file mode 100644
index 000000000000..ed606b14c4af
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
+
+DESCRIPTION="The open source, cross platform, free C++ IDE"
+HOMEPAGE="http://www.codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+RDEPEND="app-arch/zip
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	contrib? (
+		app-text/hunspell
+		dev-libs/boost:=
+		dev-libs/libgamin
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
+	"${WORKDIR}"/patches/
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# USE="contrib -fortran" setup:
+	use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
+	# USE="contrib fortran" setup:
+	use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+	# USE="-contrib fortran" setup:
+	use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
+
+	econf \
+		--with-wx-config="${WX_CONFIG}" \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable pch) \
+		${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
+		elog "The symbols browser is disabled due to it causing crashes."
+		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
+	fi
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff b/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
new file mode 100644
index 000000000000..7cbb678dda6a
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
@@ -0,0 +1,13 @@
+# Remove adding of "-g" to CFLAGS and CXXFLAGS if "./configure --enable-debug"
+diff -Naur old/m4/acinclude.m4 new/m4/acinclude.m4
+--- old/m4/acinclude.m4	2017-11-01 02:32:37.000000000 +0300
++++ new/m4/acinclude.m4	2018-05-04 11:08:33.000000000 +0300
+@@ -91,8 +91,6 @@
+ AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (default is OFF)])],,
+                        enable_debug=$debug_default)
+     if test "x$enable_debug" = "xyes"; then
+-        CFLAGS="-g $CFLAGS"
+-        CXXFLAGS="-g $CXXFLAGS"
+         CPPFLAGS="-DDEBUG -DcbDEBUG $CPPFLAGS"
+         AC_MSG_RESULT(yes)
+     else
diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index 147e365467fc..4d0690ce374b 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>torokhov_s_a@mail.ru</email>
+    <name>Sergey Torokhov</name>
+  </maintainer>
   <maintainer type="project">
     <email>wxwidgets@gentoo.org</email>
     <name>Gentoo wxWidgets Project</name>
   </maintainer>
   <use>
     <flag name="contrib">Build additional contrib components</flag>
+    <flag name="fortran">Build FortranProject plugin which enables to use Code::Blocks IDE for Fortran language</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">codeblocks</remote-id>
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index ef339db5950c..55d009016d8c 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.20.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
 EBUILD glade-3.20.2.ebuild 2390 BLAKE2B bcf33fb3b36f7f38c7b91343ed1c0a6ecbd171a42b1ee252009902569ea327c43e1b9b47d04c6c0a87ed9910e1873f9800c1bb566ef160c0258400252b83cb3a SHA512 b540957231160447eaf0dbe056a312e9fc9506db0b83271f7fff63c438be56d76b2bcf5d861d2ad3dd7f9be661250141531b7076a5ae14e2c582c89284170e60
-EBUILD glade-3.20.4.ebuild 2395 BLAKE2B c744919fae6a50569cb8d2085c04306731a91450b533a2a88c6569cb5b91d807a217f8bd73e4ef6a5136eecdb7b41d0ea7125f62b7349a3f085a6a2b068b1de1 SHA512 181ff3cea5fb9cb410559a4f6e8096ac8469c8e7164cbb90415840674303f1b2d99b9f3e3cfb01a2735cdbf32367e01f359dbfd235acc2a3ac01c3ffa5fdf772
+EBUILD glade-3.20.4.ebuild 2394 BLAKE2B 127079ba12367bb19a311de58932f2c34cd9e73c4e446970b11d20f14492a6b4f4feb2606ca2011a57d153c44600d53bc517e7cfa26810f4316bc4e1c5a789fb SHA512 2cbc3eafaba42e5d302efe02ccbbac6b31741e3270fe70391942a1cb018575be72b9f4e3132f18e100c7dbe5bcec8aa4880a6ec5ca88351b08ca33d6f119a4e1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.4.ebuild b/dev-util/glade/glade-3.20.4.ebuild
index a42b273b5b6a..ca539a9f72b9 100644
--- a/dev-util/glade/glade-3.20.4.ebuild
+++ b/dev-util/glade/glade-3.20.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 390f40f2d214..6dcae8d6fb36 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,8 +1,11 @@
 DIST lldb-5.0.1.src.tar.xz 19225084 BLAKE2B 82a0f5d40e6278147e4e2d9c7bbf0c19e512ce92c39e4ea0d9a830bf53a343c233aa528ffc3512072017ea2ffc7e6e57d1f13f9bac84a9446e41fb29f35a9da3 SHA512 ebb3c3251098cfce28ccb6a5bbc50491a16b88d1adf3c71fd38efc95482d702e1bd9e7fb11c29597304d97cc0fd88241c70ec11276426aad901e5d23f05ca53a
+DIST lldb-5.0.2.src.tar.xz 19220632 BLAKE2B 7ab97a4e96a2faf6593f5584a5455bc793a50a51370bd32d1595958e5fba9d121832675e6f31cb18a3b77b472eefa8040443b77af3e29c5aa455e2a0dcdb7cdc SHA512 66eaaead60cc908ac061bedb4fac9cb96cecb7f4e5a79a51b6fa080e8f61f718b14e5f3581ead832b495bf10f055d4253d199236a0947dd22395ec80bf2afcf4
 DIST lldb-6.0.0.src.tar.xz 19317956 BLAKE2B e9ebdd61c5116d3e6be3542674b1e3eebba19b4a2107da153565fd95ed24a97248fb80ce5220b4dce2b6e3ac5b61fcdb594e34d6af25e7737575c3f31cd45fbe SHA512 9679d1dda0c71681b1f8c5a22e775c0262de26dc5b091e1db189968b97ed3aed45991381d529b3fd4b3ab28112453f519045485708f97f765d3e3131b2a918b7
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
+DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c
 EBUILD lldb-5.0.1.ebuild 2915 BLAKE2B 4703008797dc1daf2f450fc70554bc00eb18f80d46c93fcb120b4abca4ae2a0e6e039d7e33daf5b4bee4559c8ce7b9b4c45df94e38e87ac3eb6a1b1b0b0f4566 SHA512 404bff1218a9f196093bb8c22c55641fab5f2499c12978deec9219f3e289cedcf8822219cdab4b621cc8f4ea2ac9eaeaf156350289764d8dc8364dacce79ba1c
+EBUILD lldb-5.0.2.ebuild 2915 BLAKE2B 4703008797dc1daf2f450fc70554bc00eb18f80d46c93fcb120b4abca4ae2a0e6e039d7e33daf5b4bee4559c8ce7b9b4c45df94e38e87ac3eb6a1b1b0b0f4566 SHA512 404bff1218a9f196093bb8c22c55641fab5f2499c12978deec9219f3e289cedcf8822219cdab4b621cc8f4ea2ac9eaeaf156350289764d8dc8364dacce79ba1c
 EBUILD lldb-6.0.0.ebuild 3013 BLAKE2B 1bbbbf17ae0b3f44bd10b67ccff2260105acba6cf7f17f063bb5ba9b82433bc7c6d17ada5d1974cddbeb5be5cd14edad939b241728250792683bff030c4295a7 SHA512 5c8615cc2a0c80c4c16cbc8a8ce3a2583832b3433d227341d4add0f3d62640fe4c21e96b5208c453ef349b9b093f8dfdb1298cafc612a866f1b99eaae42a4912
 EBUILD lldb-6.0.9999.ebuild 2963 BLAKE2B 54d7cbb6d273667023d8beb7e5aeb55b2c332729e49c05ec6a2b79170b06e4287f16542878abbd6b27b13a6981629d264c269f27e3107eb9198e7f9ba7db4935 SHA512 5fb250ab99d6bdac31790f7035148f3da7115bb93d65359da3b757a75c90cb2f840b37ccd72a8374434081d2c677fe523862d19ada6a693eff7b6dac5f404f2f
 EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
diff --git a/dev-util/lldb/lldb-5.0.2.ebuild b/dev-util/lldb/lldb-5.0.2.ebuild
new file mode 100644
index 000000000000..e3be91f0a816
--- /dev/null
+++ b/dev-util/lldb/lldb-5.0.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm python-single-r1 toolchain-funcs
+
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libedit ncurses python test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_USEDEP}]
+		${PYTHON_DEPS} )
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+		# compiler for ole' python tests
+		-DLLDB_TEST_COMPILER="$(type -P clang)"
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# oh my...
+	if use python; then
+		# remove custom readline.so for now
+		# TODO: figure out how to deal with it
+		# upstream is basically building a custom readline.so with -ledit
+		# to avoid symbol collisions between readline and libedit...
+		rm "${D}$(python_get_sitedir)/readline.so" || die
+
+		# byte-compile the modules
+		python_optimize
+	fi
+}