13 files changed, 244 insertions, 213 deletions
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index fa3652beebd5..f888ea22155a 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,7 +1,5 @@
-DIST geany-plugins-1.28.tar.gz 4453038 SHA256 918f644053ea205fdf0f2185ac3b8e21339764e0e761a38583f2dda7de7fdb97 SHA512 027fc5923d405a8246786e48e0d36c5da8f580b9f18510933063cc4c452ee5aaa68af4568ee20d640c1dd2bcb29a9361b8558a81a5a83f46b5d99c9ff639306d WHIRLPOOL a328557ccd899ce56ba2cb12875836ecbf5939492a1e19a61e5e2db15a5b10969e1cbf0eb912d551c75e9fa7c49e65fa8a48f7e2e2ebfd4477b4c88b4e6857ea
 DIST geany-plugins-1.30.tar.gz 4469990 SHA256 a49202d1c6b2a82446a79c57854596de1e231481163f680c7654f2cb165bc249 SHA512 11dc44215aaa369831c249ef84b5dd0ee7eecdfbbf4707fc6165d78201e9e755447463c171ac6c8b2bc70df28a97b23762073ab9b31f7c33285d4728089da807 WHIRLPOOL ada9c5cd3f78948384c9add373d8b60aa09c0de931304aae4b41f54aaa35dab3450e946e2b39d84c069521113a55720350170edc03253960854a0b842e31903e
 DIST geany-plugins-1.31.tar.gz 4547472 SHA256 933a4f7f041d676f925d021a5adb8c6876879beae53ac06e4a1c70abcb9e25d6 SHA512 73d48b276c93211c6ebc726b24726e7669184d8951d5d29662cb8144c04a239ef8fb621f91b7798720bbdf319a09e35efcaee1535125697838552bd0b1e47bc7 WHIRLPOOL 2a1f4f2a1c88f9bb132b90324ad603a2dce7786eb6c903ebfed9defa140d2756e1ba18e5dffc8b8bd6096ff18b2def1a25f9b163e3f91ec27920aea98489006f
-EBUILD geany-plugins-1.28-r1.ebuild 3738 SHA256 f3dc1d75c0fbcbd72a0e45382bd820358b5ba073f8008358f2c266b084b3207c SHA512 230c2ddf7e2634c6f265dde86365df7f7d7dc4c20d4ec0d9d7bd2bb98102b52399e419a6d73f8c8f63c7aed0c7b5a2f71fcbd10a965f5d1fd023faeb39feae33 WHIRLPOOL 9636633016438fdb3a92d70014f2107d9edce125fd4a655c1df5162c593e4fb9cca669d7fb33e51c21f42cb196b2bbe16ce078a3a77995423069ef9caf9017e5
 EBUILD geany-plugins-1.30.ebuild 3438 SHA256 cd621dff2b7b065bfff910b7f19621df889a1b4d1b3af5a7d764df81ff98a353 SHA512 ab7193e7c89b6824c33d489e8bf0b6098b814c9bff52987af9c4ca5eb059902102f94e659b90e4ba1748f9242d7fbb3a3564bd88d0826c36f4b4a3807083eb99 WHIRLPOOL 3fd92606b83f5333e6e8038b372f5056b2f35d5b1bc371320e92c4c0eae33f8a7e58921b216a61035ada17b7bac25e3622e0770b700980e45c01fee443722402
 EBUILD geany-plugins-1.31.ebuild 3519 SHA256 bc71746904b1b76bc2127a3a5547046910c4564092e84e6109e9978c01ce4d3b SHA512 1c806fe9dfd3d54552836c35a98ac78e36cbf6eeff671def0e0a42d60e3007f8c6741150f09ecb1540a6637944c4763d827753475e09768556249132bba6a7c6 WHIRLPOOL 4228425a588189a74146b2f31285221edaa03a84a81b19cb6985fbd1b8e09ecd7c2610cdd89bf94cbbac7829d412be3e296e0b62b08d8f97ab1e96f0de2a17ad
 MISC ChangeLog 7285 SHA256 49c9b9b091b247083690219a260192d992464079a35bf26e2204750db18d8e7a SHA512 8897810343f06130e3cdf47b97e0986f0e0d2078057af3cc413bf8056bae0b6a2bbbd3a7444f8920aafc8a23c31adaf39140ac2cbbf215e3de6b4a1d72265002 WHIRLPOOL fa5256aeb9da48443e50e4fb106560829cca67c726bc982a2d89f537a2535ab0e4c5daec50c69379a23ac1a82ba39e81f900e4e1093ff297e775e64f2a089160
diff --git a/dev-util/geany-plugins/geany-plugins-1.28-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.28-r1.ebuild
deleted file mode 100644
index 5362d11ca593..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.28-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-
-IUSE="gtk3 +autoclose +automark +commander ctags debugger +defineformat enchant git gpg gtkspell lua multiterm nls +overview python scope soup"
-REQUIRED_USE="
-	gtk3? ( !debugger !multiterm !python !scope )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-GTK_COMMON_DEPEND="
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-"
-COMMON_DEPEND="
-	>=dev-util/geany-1.26[gtk3=]
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	autoclose? ( ${GTK_COMMON_DEPEND} )
-	commander? ( ${GTK_COMMON_DEPEND} )
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:0 )
-	defineformat? ( ${GTK_COMMON_DEPEND} )
-	enchant? ( app-text/enchant )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	multiterm? (
-		$(vala_depend)
-		x11-libs/gtk+:2
-		>=x11-libs/vte-0.28:0
-		)
-	python? (
-		dev-python/pygtk[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-		)
-	scope? ( x11-libs/vte:0 )
-	soup? ( net-libs/libsoup:2.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	scope? ( sys-devel/gdb )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# bundled lib buster
-	rm markdown/peg-markdown/markdown_lib.c || die
-	# devhelp plugin bundles devhelp
-
-	default
-
-	use multiterm && vala_src_prepare
-
-	# make fails if LINGUAS contains a language which is not translated
-	local po_linguas=""
-	for lang in $LINGUAS; do
-		if [[ -e "$S/po/$lang.po" ]]; then
-			po_linguas="${po_linguas} $lang"
-		fi
-	done
-	# only filter LINGUAS if defined
-	if [[ -n "${LINGUAS+x}" ]]; then
-		LINGUAS=$po_linguas
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable !gtk3 geanydoc)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# peg-markdown is bundled, use app-text/discount instead
-		--disable-peg-markdown
-		--enable-addons
-		--enable-codenav
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanylatex
-		--enable-geanylipsum
-		--enable-geanymacro
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc
-		--enable-lineoperations
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-pretty-printer
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-xmlsnippets
-		$(use_enable autoclose)
-		$(use_enable automark)
-		$(use_enable commander)
-		$(use_enable ctags geanyctags)
-		$(use_enable debugger)
-		$(use_enable defineformat)
-		$(use_enable enchant spellcheck)
-		$(use_enable git gitchangebar)
-		$(use_enable gpg geanypg)
-		$(use_enable gtkspell)
-		$(use_enable multiterm)
-		$(use_enable lua geanylua)
-		$(use_enable nls)
-		$(use_enable overview)
-		$(use_enable python geanypy)
-		$(use_enable scope)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable soup geniuspaste)
-		# Relies on obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-markdown
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --modules
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -n "${LINGUAS+x}" && -z "$LINGUAS" ]]; then
-		rm -r "${D}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 8acff5006ae5..503c03780085 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,9 +1,9 @@
-DIST geany-1.28.tar.bz2 4315264 SHA256 f73a3708f1a26e9bf72da564d5037d6f7fedca2e0d6175db0681c2b672100a5a SHA512 b36c7effeaec88019b35ea6e6f6b5d0c691fc6790885f6ce73fd1f7e34a50e92e49fa120479c0eba17d564f985e5a560d4ea549a6e9b4e6e6f65f9a25b0c811a WHIRLPOOL 16d2e122d9a89d8f66522f499f79826b6662a26fceeca5b7be2471d13c8a5036f68c1be66a08e1af9242167176f4080bed6acef9ae6005d9d868e6a7fb723278
 DIST geany-1.30.1.tar.bz2 4352154 SHA256 0ac360f1f3d6c28790a81d570252a7d40421f6e1d8e5a8d653756bd041d88491 SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3 WHIRLPOOL 3f0ae26facedef3df5e96020a23730d9729641882d3a59c2c22bedf14c9e1294de32521a65573a36ad49b0336ee339cc9692718d8c8e153d5988f8d4b8abdf84
 DIST geany-1.31.tar.bz2 4355879 SHA256 30fdb906bb76c4251a8bcf83ee267db28c26ef6ab867668a782cec1164a3aba5 SHA512 6b5b07928173ef2673867ce2ab9cef1d74dfa97a5ca3515bfb85c0c4d239d7964d5f8d912dce3d97cad06a92c7a967abd454a5e4dc91e481d47de7773d8f6503 WHIRLPOOL c8746974afaadeada7846ec66dec4490c76316e12fbd59670934f3ecf28ace451e673e8c5a63ff740513ee4b01b6b3d5091032af2a4125d058dda7fefe3aed5f
-EBUILD geany-1.28.ebuild 1570 SHA256 b445b0c5bfda40da7d0fe3deb239e0ca7a8bb2d56e2d87e732ea8c9cc60f5347 SHA512 f615b350f98e7ada744a9a67ad6a96b009eb1fb12216fc9e200a50a6d3da651f1c083dcda638002769ea0a0ef2de5f6601987250a243e7c34c8e2686d489ceaa WHIRLPOOL 572229fc6ef2d98b1db84eb852b3de07560a566b244091377fb14098675b9125080ebd193e39e03b60c4919bc971d81edc34dad2a59c6edb4796338e5350d3ac
+DIST geany-1.32.tar.bz2 4341296 SHA256 8b7be10b95d0614eb07f845ba2280f7c026eacd5739d8fac4d5d26606f8c3c2d SHA512 a5ec73f690368d735e20ba90db90ab9a10e504545374a0d82c82af1f2df2f1382edb966e442257a271602b9322e3229af6a07f9c883d5d2d32236dd8f7791b5d WHIRLPOOL 4baef6747d7e8581fdc61aa08321ccf078c7f74b2d754c724a333f24543bbbae07c3d51eeef18f930364e0b8d487860a7d5d47c3427132a0ceb62e0cb596d8e4
 EBUILD geany-1.30.1.ebuild 1570 SHA256 278d0c1e33c2a124821b67dfaf7ae81e725a25985afe2c964ed78f41715d1798 SHA512 c8d077fa9cfb0a7911f8ecb4fa343f359da2f48ab252928ba594e66e33ecf694e28239f5ab0185cf0d36b2e0421e053daaf9d12ef5fce48a8b458a47d319fe2e WHIRLPOOL d382bf9f590fb279f40c5f8348b0d083269f14f9c933050f2a0612c1b5666ffbbdd49caf163d975edc406b4d622eb825d11a53b8cb79d33f6b7304c6f55cca45
 EBUILD geany-1.31.ebuild 1578 SHA256 2716e5b41682fef954fcb8a3e2025bc87b04de1b9c5acc437a88affd0d9fa60c SHA512 2901aeef60de657cead6a8014f454fde320ea444ac0971e8d9575b22a26fc28c5291873cf2aa04a630159c7385c8089cc9a4fe86d4df346a828a065095df023f WHIRLPOOL d06c586b1b43779bbdbfc94222b6fe65cb93e79f42c164374b37110c8f33525f83bbaf39ebf2153aea616c114ee3167dbbaeb1bcad41c6ef80fe27cc915025ae
+EBUILD geany-1.32.ebuild 1569 SHA256 a390399f28d4d04c9d333be75ded7c8cf55b47116c5189ae4700b78d3987d89e SHA512 092512d94cd461d2ba5822a1a7c6fb8151170bbadbebf037f2da41351e7be56780344c29734bc48d88f369fb20f2d9a617d1a9600f35909fd0b449d764373182 WHIRLPOOL 23c8b9b7319f2ba9145463d59f4fed36d8d425b8b1c8d3feed3e67245fc4758420307e53d5b81b08be48f7d5889c31145c01cd244c97ffde6a48cbc7ceab0abf
 MISC ChangeLog 5960 SHA256 c01915e517d45a51839e0203819d35b73afeb72321d703391a9b304225f50a08 SHA512 55e315eb96bac6d50040d9f998bab1a5bf6679a65b5abdd6288c884d5aa8d6c4894b3cbfe20b0675a60117734b1017f8a856971a6385be90d8496c20dcac4a8a WHIRLPOOL e971ce6279ae8638bc2b8433c94a21348b71ae2fc626cab99396e63934c9b82e33a3c589202f5ae7021ff94f6e2304cb3ef132b2f87d01e578f40c923d610e9a
 MISC ChangeLog-2015 11051 SHA256 85a686b3bcb423d83d485f73edc33415b0e8a98b2a36d6a346b70d1c6a854183 SHA512 e8b9c51fb2e134a6380a10a757db4e2276e55c15397ae1d033069b98c7990ffc5b4761b6b2557dc95abd257ad7041473d60f6edb796a1b75907d053778d7d6df WHIRLPOOL c9b5084b7b5b55a3529e84b40037753df609dfa2cb808077cedf8380baf48de9441695bd3996d1dcefb2859f1ccf660cf84ee4a6c8961cb47607374e038074d1
 MISC metadata.xml 1992 SHA256 6397cfb3a83658527550c9b6a53154d5172f0e04120095a99b16da48bcb7bf9c SHA512 74ebf425ba5707bd535cdd3a70af5372eaeebebd6a49a4829b4d2aae7e9dd5b0f9955b7928d869fd24a3ee310e216d52ffff2d20703611bfeb20619e52fa9f29 WHIRLPOOL c979c76e4c1563d9d121d162513fc7374ac79ec2d5ab78afbcb610caf6ad94537a7a10b188bb808f84d3f45cdd212f46ab02e007a3dacf41063f29124b48113f
diff --git a/dev-util/geany/geany-1.28.ebuild b/dev-util/geany/geany-1.32.ebuild
index 7facaa6aa9ba..9dc2d38f3f60 100644
--- a/dev-util/geany/geany-1.28.ebuild
+++ b/dev-util/geany/geany-1.32.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils fdo-mime gnome2-utils
+inherit eutils gnome2-utils xdg-utils
 
 LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
 NOSHORTLANGS="en_GB zh_CN zh_TW"
@@ -13,7 +13,7 @@ SRC_URI="http://download.geany.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+ HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gtk3 +vte"
 
 RDEPEND=">=dev-libs/glib-2.32:2
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.32:2
 	)
 	gtk3? (
 		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.90 )
+		vte? ( x11-libs/vte:2.91 )
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -59,11 +59,11 @@ src_install() {
 pkg_preinst() { gnome2_icon_savelist; }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 16fd98709a21..69ca6ae25b54 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,7 +1,9 @@
 DIST kdev-php-5.1.1.tar.xz 678368 SHA256 a33abd4837354218891225f0e18b7e9eb6e106cc1c744731a9003a9ea71e1404 SHA512 71d59db196e33663ae7167b973c3514e795d636370ace39b9c760a601f4bd947ffd6a3f8d7cfa0e199c77d8818dfeaf56882059aa18026aadd1e7b808326d0fc WHIRLPOOL ea4c437fa30bbad082d2e2fd65d38e8b91d9c4701a7726db7fc7010b80ca46f05d5975e5a2679df82b26ba26175abb11f6b0dca16f98a0ec992531dbe33fe91e
 DIST kdev-php-5.1.2.tar.xz 678624 SHA256 05f1a9a47cd4a8ff74d46f7cef0baeba31c159168c1c58efd7af5e3836980de9 SHA512 c5c6fa288b048fb19597c8cd9708a2d8570c8eaab4584a1ec0808cbd65788ae15b140e8c0437a3a18c2561c078c26208597c674efb37623b5199260ed5b3f851 WHIRLPOOL 31f0416b724a8aba1e5ed404f4821be196af16f1f80773b6bee50858f3efb1460793d8e5d96031272232a2e5f346d4b0e6d6515b42b69715aa4ff3dedebc1418
+DIST kdev-php-5.2.0.tar.xz 683100 SHA256 823ec8b44449c58a408e66a46301e0e4e4a8dce1491aeed2ab3292d0744c854f SHA512 e95a861ab74a5953c7298c7328f89ed23200524911775a85997d061faefd38f70c06b978614a150ea19e3751432bcc8ecd4b71009a4f635869b41d2f25bff412 WHIRLPOOL a041440e48bbef7cce1017e7a20354320a3311bdfc27a0386574b9652a838a897ec0d7d2c412bd2b99c8e969b5395849e41b3b276c9c6c0d9de6ffcdee5ba1a8
 EBUILD kdevelop-php-5.1.1.ebuild 1038 SHA256 f5d86f604f4335dcebb94378c01e6f863570e8b4369eccad64ecd0cfa0c86c56 SHA512 dfe152c398d333c9e8bdb6ae29e994d8a24ddc30f9d8e6926123bbef7bbcf53a846e8324a02e9eab34a655e90acf85ad1423ca6a624952c04a899a412b4449db WHIRLPOOL ad1f1d30c9dee0f4c8494f0d05a2b8e8f62be3eb5ee8028c16e0b795e2965100e059aba07d32ccf33396a947eaec05b922cd21d1a3b9ef4caca56b6d23dfd7d6
 EBUILD kdevelop-php-5.1.2.ebuild 1144 SHA256 5f593a07c73862541cdb7274e82312112d3dcb77a7984379b4cbc5bc852a3efa SHA512 482acdf089bb68df862145fc153a9463b349122b7dcdc0b463831d715f5c6956a1d68d8147608a9726d90aa79652bfe32355265eb1111f1ed6f58fdfbf1d24cb WHIRLPOOL 79d823a582f6ce572fcf4871bdc94614bf495fb984ee28f5b0c3689db8cd817055a99a268d38568fefd6a20aeacd03f90e9537c6a00d72349c9b43b6d4f6f491
+EBUILD kdevelop-php-5.2.0.ebuild 967 SHA256 5847e363435b8ea55d30e05bb14ed53d4059ded46195d6d4c5e98a0731bab6db SHA512 5eadf98c425c4c3090c6778eadd954833c58df1dcd50a795b91084cc965639416562de0024c4e19699f543ffa15ebc79cf6ab8b2a51a9c6da2e9bd78e280d8ac WHIRLPOOL 04d52599891af8d7fbde40d17b89bedbd5591f19bacc99b941e5413566a7ce6149f6e2710a371a839f32095d22f4738dcbd577ac00a57046422bc527036a2d7b
 MISC ChangeLog 5381 SHA256 6d7c24e9978c1cf6a3a8fe7afce1799b636b10b2a8f10da0c154ac2fea851ca7 SHA512 1f971dd232dbe20a38d445458ca558355414f06d9229384b4b89f774a1adcda7359822484220e1f379ead824051a71e5cf63bcde161bd3959cb6a360da6a19df WHIRLPOOL 9049eb56aa5ece4401c228db5a5ef8a8a1a0c192ad0ee8777099cb6efbe7f2900b59567ab24a1532d94e35ec43421981c5c428d2a38dee6ca5e0ebe71e8a0e89
 MISC ChangeLog-2015 7253 SHA256 6b212a61458875a2cbfe51d9e3e25f92b6527c670f5afb2d4e7f81050a5466fe SHA512 81bf387fa7d4ec3c9de6488cb9e2f707bb8694ab9f3412df52597c1168310f822172b0ccd90889dbfcc6932bd5f2c14e0baf7ce35f6d5c9805db4b028fa45f25 WHIRLPOOL c7dc35b0962b276c56f04f0c14c10f5c7abb566c6aeda7ee3e13df078441e5756ba904996f5805233b5a7401fb1a6d6dbb2b80b9fa87773255ff3c1c2d8f19b9
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.0.ebuild
new file mode 100644
index 000000000000..f6d4bf8fd219
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.2"
+KDEBASE="kdevelop"
+KDE_DOC_DIR="docs"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+KMNAME="kdev-php"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="PHP plugin for KDevelop"
+LICENSE="GPL-2 LGPL-2"
+IUSE=""
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5
+"
+RDEPEND="${DEPEND}
+	!dev-util/kdevelop-php-docs
+"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 091ff217d51f..f239adce62f2 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,7 +1,9 @@
 DIST kdev-python-5.1.1.tar.xz 1068832 SHA256 e2d8ed64106fb6ff12161095df67d078af9e56c9075f7c2a99d96fb517ff020e SHA512 e232b2fc44876c8e46422ea2986c2df06071e3422236139d3658f514d2f9d968c4f6320048566fe991c5c510cc3cf36eb55389e3d2205bb29c92b4c6a97b19bf WHIRLPOOL c5990fb2bbd74aee057b31b9dd74dafad0d1a8fe183f8c9321d444aca820dffe85a37642fa7de961362dea1b51224d6e3e80ab4c67525c82c676a152dd76425b
 DIST kdev-python-5.1.2.tar.xz 1069080 SHA256 fd80a2d4073595b9d4ac404acc4d8939d43c9f367bc0e9a22dfb11781017690b SHA512 1c91554bce3a1bb92b247a8b924e5b73865b68c8b6c2898d708d3b45f89f1ca9cb4207bd2f1a6f71e7df95781cd5d0ddaa610fa5c18e8f4e902306df5c38591a WHIRLPOOL ff22f27c4f96c7d2325278ccb1f70c4e13d73f980f3c6807d677b071d21252de7abfd82e709a9034219280c805b3f6ec8e3a2a90ee56a32686e72dfb550f30f1
+DIST kdev-python-5.2.0.tar.xz 1070312 SHA256 9efb35b3a4abcf716484e1e80a5d92b9213ce14f3acd5716fa024e49111c960f SHA512 9b938144eb1f29d8caed923c724c93957c4f0f92eb05e54dd0d61d495cd919410db7dd0649d9ddf0b72e1e556d2404479f29acb7c77ee887ff8ec33686383147 WHIRLPOOL 3efcb8bbf7b01e3eba190123ec2afd9709d4eb6d37165cfdbcb88c9f8a6cfb54e479419b8c0bf783b3a4fc40848228bbe9d6f4fb77cb0e8f6484f3f35fb2bd98
 EBUILD kdevelop-python-5.1.1.ebuild 1168 SHA256 7725c31d2ec54dcc9f6c33be5988fa4f45c0a334a7c447cee542988ab46ba5cd SHA512 462df962e53ab7c8ca4bbe5527e5797b55a286e729628fccabe9ffa4018f7f50b620dfba141d073a7c0ce2dcfcf6641611ca1ecf5f523bc0548a4bc3bfc098aa WHIRLPOOL 749a096a49d4f3a3c178b1ecd0a61b0fde61b14cd86b1dd8bdfecb456d5ccea5e65cfd377d9bb9a5dbd2159e40749a2669e98b56241587b9fb4fb884e4a64d9d
 EBUILD kdevelop-python-5.1.2.ebuild 1194 SHA256 7df43d853af27274390fcd8a38eb730937fc03c1d1c4f7fa41e2111268d4bfe6 SHA512 b4cd0fb019891bc8cde0724df72eb7a61abe3a54f656015af24d75cf0ff4f9cf31432bc805b92e9d3b8009cbfd6cf309d7391605713cc671189325ed3e199bd5 WHIRLPOOL 8be2d9409ac6f27025042eeb5e0c0e73b3009eee1aa7bdb41ca75724215950c1f100a4a12cdaf4ba2ec1dc97c2db76393b30d27ccfc72442d6c3dcf65ca2d6a4
+EBUILD kdevelop-python-5.2.0.ebuild 1170 SHA256 4e40035cd75d62a01f82f5fba5b14007b84153e31e93bae9963ba6c1905f7a4d SHA512 817a237af618c8c68e1d125cf8ef69b0de19e6ef4b8da7c18530fe557b88b5754d83ba07a6cde22ea4de3c103ea1202ca68061500faf0981eaf32671ad8dd7a2 WHIRLPOOL 86f6dcd387d3de95efdb40b5d57fc9d1c77ad924bd388ae70bfc27df45b27ec54b32c2f072e066e7e64c4893575dc47e0c53175cc64ac861c3b3208d60c7eea0
 MISC ChangeLog 5435 SHA256 13c25a8abbb9978bbf25bb31a87ab8f9beefcf109755dcc9f9c32687b4110421 SHA512 6acc6054af3776b35f9cc9380a03db2fecfbb6254cdf765a466d24fd423fdf3d427f27b37982104a6da1b6474786bc90b36ffb25a68c3ad2c27e5b4dc5dccf32 WHIRLPOOL e5eecef1aeccc8f504b90b9f4f6e0fccc36784bafc962d1e9e0ab4d1836556c60e3f3cfccb19aa0bf834d31ee42976ff6c4909d6dec34f7fa7b4a2cb4bc9166a
 MISC ChangeLog-2015 2238 SHA256 4416ee4adaa8e12e897b9233ee10f887a24393da5db1d55d46294d9cb91d037a SHA512 ba1cf179b2ee997ed06ff69c85705c2488ce9f50ce5b7b1ce3bad35be0e9064780ecf69a938804d8ca8aed313bd70173b000a588a792a5762d831bbef9ab0ecf WHIRLPOOL c57356d53ac61fa32dea9350faa652111dd36575e729b44e307be0bf395273be419d202cf7e59ba094e0c4e259ec35ebc945ebec9af9804b169ca4094d23d22c
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.0.ebuild
new file mode 100644
index 000000000000..d2599b41ee23
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.2"
+KDE_TEST="forceoptional"
+KDEBASE="kdevelop"
+KMNAME="kdev-python"
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit kde5 python-single-r1
+
+DESCRIPTION="Python plugin for KDevelop"
+IUSE=""
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-util/kdevelop:5
+"
+RDEPEND="${DEPEND}
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_compile() {
+	pushd "${WORKDIR}"/${P}_build > /dev/null || die
+	emake parser
+	popd > /dev/null || die
+
+	kde5_src_compile
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 4940b4c1d426..f6c2bf7c2ed2 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,8 +1,10 @@
 AUX kdevelop-5.0.2-ninja-optional.patch 426 SHA256 de410283856feaf6e13f5edf88d659cee65dd677bdc244285864bd4839af4a2e SHA512 7c54ca466ac8afae7ced2798182104977f1a41de884afb8e52b6b23ba60f87a184b7898cc991de1211e8a194343396851d50c25fa60ff69205731725074bf19c WHIRLPOOL c4969d7081e710058c055fdb863b4cfbf5240ae8fecd71fc165cbba4414eade65a2d21b6dd0526e50611d8c14adaeee0dfa1fcdcd141b53a14c8c22bfd82c442
 DIST kdevelop-5.1.1.tar.xz 4685416 SHA256 0a01a4ffb2f01802cf4945521a3149a8f82c21fa8a97935991f1854b7db5d754 SHA512 e2c1a4885bab9815341a53da6a98dd4939b7128eee174e79c616cc020f464362a2730508b3a8d66f00e4ea95f2098b92d6328b43b9f22bd77145bbe6ce096529 WHIRLPOOL 7e4134a89533ec510486f4b65a50cdc4b6f9f3ec3639f38077e568b54ae66d470f8028348eaab875c08ab8de4535902e2572aea99f86baba9359b581747a4366
 DIST kdevelop-5.1.2.tar.xz 4688696 SHA256 af54e807847d145fe5f3eb55962ed0d22e6363c2bc6c32167e51ca4823c00ac7 SHA512 3f359587c7dca3ad4d0db4940cc9557bb61647672432f21c21d6f493e5e5c96e026c7dc155b66a7be4d20b06972fe961d8a3dda28e8aa273d0a4044a6242e39b WHIRLPOOL 0e3229a9b209cc3dd0afed13fdf72053dafaff3ca3d75172ef575590e6a5eb8374a4c0ded6e10adabb305a91f725a26877f91d417bd05d647fec2bb8f169f1fb
+DIST kdevelop-5.2.0.tar.xz 6642408 SHA256 88e7a8f2f57a4c688da7a6d522b06e2e70ebddf2f9129b8f93e4c74df029e900 SHA512 5908ed1e2e66f1c589a9cbd323b4e5cf8cfbf6574cc52557b52ba2ea0e41eb8bab8947f9e8ef66fe815d6cf408fbf2e1a435480a6a9b90bad4330b6f5d0787ac WHIRLPOOL 506e978d8f994e5b0e4950c247f0c49aae586d6283d4c07457dc1cfc71504445b1a3457b513a8e155a4d78a43fa1f0eb228d75988634ccaf8ddacac453592a81
 EBUILD kdevelop-5.1.1.ebuild 2562 SHA256 5bed63ece3d27fd5b4aedc2a2d2b0220b6e6e5e8d365367a6c2f04902f23ba20 SHA512 f7d3ad87391cc509ffaefc5d9308ad7cabbd4faabef68acf1ab0e00259526014bcc100a686879e796cbed99090bbf354a7bb5493a8dba356a4b31581c6942e26 WHIRLPOOL 5c45c5dc2f5a5bf16780e50f47c04359956052843c3221a7776c93478d659e2664fc2b34c832d57b2cfbb5b03bf94702b5cdfbe81ef01963bbaa64302987d21d
 EBUILD kdevelop-5.1.2.ebuild 2569 SHA256 834b93b5409a57336eb08a91fe0d4b0ac59dd2bf7f797b6f58146d7ae6f4c3e6 SHA512 2ab9ac37d94e4a313f9d1f375875043b2f6439150c91ed66207a13392152ebd9d990c71979cb7b2071612aa0a6097c9d2ffd89de0ff181e1652793771449a200 WHIRLPOOL c26e772c6dd2f70acfe6fbbff6683f928bbdf24ea8a0a6d1cdcf87d38df8c262e1c1d813f7e7c395e776278bd97d0d28829d0f65660ab5e0b6c485cf69a7a994
+EBUILD kdevelop-5.2.0.ebuild 3811 SHA256 1065202c04e18291459a8b3404d1b51cae1aeb88a08bfc2780dcbd5c6f3a94eb SHA512 3d592f4d8e0842a8ad6c30d41c02f6e58a2a579613c815420d70b3903ceb4086ffd8cc160b2f0270926af89b1dc0a4f5c619c14f5934e3f2e1fa4089f5c09869 WHIRLPOOL 02bf6abed651a97e803c2306ff8dea7322ef670cf1ee2bc1669d72f69dbd4f41c7fe39081252c4b3bf2c89c9a1e8a2abc4c0b3f9e74489f304e397fd9357a22d
 MISC ChangeLog 7546 SHA256 62a5c648dd50a1c831960579da88ff3aad5f5f198c04afa2e8dca66e2a41b43d SHA512 f7ccdeb52b318a7ac700538508ddc119b3833349705715e41b57aec8707ffc69cbf948abbae08dd6d44971d46b693ac0e55b54344094048cb7c0ae24099433ba WHIRLPOOL bbbc218f69de23736553946b14fe8ff508437526af62dea7d680b76dbc182a3dd4307fae9261de47ba2b8a9003944c2cbdc1938804cd025672bf616df2db59ef
 MISC ChangeLog-2015 39119 SHA256 6ce8c61c7acd1546a9d894cfc7754e7363ab7f0799b82747ffa0615e489366dd SHA512 b78ac3c39b5fa535956066568d56bcd57a54b42614abc5cc28015909b1824878d89cfe81172782d6ee85f24a572304ca9565c88c5c51d191349373a0ba2a9e20 WHIRLPOOL d1d433c52184613a9c6bd1fa17334fb6c67c311a4ddfe2e70e3d5693dbc268d63ff3c416d720167cc59e2d99c50b7baaad41dcca696ba9c2ac95d6d117c17f3d
-MISC metadata.xml 606 SHA256 ae2ded29876f28bf22af2a6ec83ab5f1c73f645b05f95a24e535d945fccc5d39 SHA512 029fc300951af3f0887192a7c51efb51b4107b05433d7b47af2a1346603443c2da4c7849bcc4b06d08445c12893a6abddf89fbe126694aa1809a43579cbe9600 WHIRLPOOL 3368c317e6a8ea906a395eba09a0828d911d02816c59bf4968e5c02f0a88be3b564f4d606c6ef3ebcdeed38fe3a07021979369bfb4cf38720f6c8be050b6e835
+MISC metadata.xml 938 SHA256 70c1b95243b7031f35b40aa03305bfb00fc6970d4e9901e9f9c06112edc06937 SHA512 8dc8349b457c1fe70d71adf9a31d387ac3008444275d919cc511b548461b0c66dfd30ec5a025988138f3d1b780beca9f958407973d192c110c0a00eb51c27856 WHIRLPOOL ea6cbcf298d058e084ae07386c6d63f3e59adde2064a2f6e95b10ed542d5ef4836301d00d7ea2dde0efb051c411b09cb09455ac75061355dd691cca9ad526b35
diff --git a/dev-util/kdevelop/kdevelop-5.2.0.ebuild b/dev-util/kdevelop/kdevelop-5.2.0.ebuild
new file mode 100644
index 000000000000..c75aebfa2df8
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.2.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.2"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+LICENSE="GPL-2 LGPL-2"
+IUSE="cvs +gdbui okteta +plasma +qmake reviewboard subversion webkit +welcomepage"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="test? ( welcomepage )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep threadweaver)
+	$(add_kdeapps_dep libkomparediff2)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qthelp)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	>=sys-devel/clang-3.8.0:=
+	x11-misc/shared-mime-info
+	gdbui? ( $(add_plasma_dep libksysguard) )
+	okteta? ( $(add_kdeapps_dep okteta) )
+	plasma? (
+		$(add_frameworks_dep krunner)
+		$(add_frameworks_dep plasma)
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( dev-libs/purpose )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+	webkit? ( $(add_qt_dep qtwebkit) )
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+	welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kio-extras)
+	dev-util/ninja
+	>=sys-devel/gdb-7.0[python]
+	cvs? ( dev-vcs/cvs )
+	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
+	!dev-util/kdevelop:4
+	!dev-util/kdevelop-clang
+	!dev-util/kdevelop-cppcheck
+	!dev-util/kdevelop-qmake
+	!dev-util/kdevelop-qmljs
+	!dev-util/kdevplatform
+	!<kde-apps/kapptemplate-16.04.0
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_cvs=$(usex cvs)
+		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake-utils_use_find_package plasma KF5Plasma)
+		$(cmake-utils_use_find_package okteta OktetaKastenControllers)
+		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
+		$(cmake-utils_use_find_package subversion SubversionLibrary)
+		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
+		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/konsole" ; then
+		elog "For konsole view, please install kde-apps/konsole"
+	fi
+
+	if ! has_version "dev-util/cppcheck" ; then
+		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
+	fi
+
+	if ! has_version "dev-util/heaptrack[qt5]" ; then
+		elog "For heap memory profiling support, please install dev-util/heaptrack"
+	fi
+}
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index f7ada62fc4f0..75711dc9844c 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -8,8 +8,11 @@
 	<use>
 		<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
 		<flag name="ninja">Enable support for Ninja build system</flag>
-		<flag name="okteta">Enable hex editor plugin</flag>
+		<flag name="okteta">Enable hex editor plugin via <pkg>kde-apps/okteta</pkg></flag>
 		<flag name="qmake">Enable support for QMake build system</flag>
 		<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
+		<flag name="reviewboard">Enable reviewboard support</flag>
+		<flag name="webkit">Enable deprecated <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for integrated documentation</flag>
+		<flag name="welcomepage">Enable welcome page, requires <pkg>dev-qt/qtdeclarative</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 56857221c318..45a715ded45a 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,8 +1,6 @@
 AUX mdds-1.2.3-buildsystem.patch 901 SHA256 45d6419de44de5d978513c013619342f39fae2a493dec0275799915f166a6848 SHA512 bc48b893c0b3d98aa45d7642bbd9bd10ee0f183bcd3da848a0abe4f33547b693e171a327439aba9b76f0683cc15eeb0410be7ed6f834d28483b8f82f8c13678f WHIRLPOOL 067adeafaa0128e26686fab279ae5ae053aca839b6001e9da852e4d9f59ddc126a4ee9fab17761a92085095fafe8f09d44d4784c4e30b9cec318dbef776ad442
-DIST mdds-1.2.2.tar.bz2 286185 SHA256 141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d SHA512 552cb1b65c03cd18eb679c95821e47c1151e1b3015043de4b3a7bc14d27734772fa4d80fd90ab48998d0bc75385a3d29c4dd7ce826cf84b012685573c623bf01 WHIRLPOOL f0b24a886ad6b275267603b73a95c3b83ce14808f90daa0e680babec966a52de19349ac0991d76b9279818897f783d1768ece74f5f1be1157fa8bff94e5e8a5a
 DIST mdds-1.2.3.tar.bz2 287079 SHA256 402fec18256f95b89517d54d85f00bce1faa6e517cb3d7c98a720fddd063354f SHA512 e5935fd99a53df124532cfc8e46349b2ef9ca79f5f184ca2da941c9a77e66ee40e11478e520bf9cb62e1bcea4b69deab5088265e1b89fda04417130aab227c3d WHIRLPOOL 88e154f3e1141d09736a8a9d5b4adf3612cea95a82773f59053d8e83f7fec3a0c292f5453df92627f31ac7e12b2f702dc281c959e7f219de91f2a1acc15cc7b4
 DIST mdds-1.3.1.tar.bz2 287612 SHA256 dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1 SHA512 c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8 WHIRLPOOL 3ac7d8b74ee05e68816c4437f7bc25bd306a07cf6f570340c8ce96ff3ec7c232fa3403aa27af49af835f0dd760c4c68cd1c3a5cd27611282ec8ce96260a6bb20
-EBUILD mdds-1.2.2.ebuild 948 SHA256 3c793ed1764b5a3d7f12fbe6337643c5352ccbbdc882bc182289c342ce898e05 SHA512 e37c00f142a0e5ce4cd2f8a17595a7ae8a74419cca21ae63a10ae119c334dc6484c811a417e9625cfbebbf8542822dbefab7f0f96d4f6bdcce1ea66df671606d WHIRLPOOL d2f941c1da66753fbb90ff6fc01a16a2fd7567cc382fab2ce556be5320eeda1aad9e68b8db1a05557431d2ca588f49820775096be724718fd2edaac960182f82
 EBUILD mdds-1.2.3.ebuild 945 SHA256 7203fc5f96e19b23120c78b450be07a369de43999bd5b3483707ab29284bf2c1 SHA512 37843f2ad2bd96b4c4372922617a4ca67befa8b7d27977e6bdc86dd5a37bc9a65c4213a3b463648eff2d599bcf0a4f7821becd8bf8bb9cf4f8d22479cb8040e9 WHIRLPOOL 46cd5d35d32b81aa647260a36b8c5fd2c830619bb7f741b8e918ac4fa28bc673e9b3dc26c9b44d4867cbc8fdea247212de68806f7152069665c20e2c187de880
 EBUILD mdds-1.3.1.ebuild 949 SHA256 5d3e27b5716fae1bb428d905193530ab5ccb0fcd8f7876b6bb4f9d7836f85fc0 SHA512 fbdce865186281d17dce6a783854c49d76073756154eb1044b369eb0287600aff4cc725610687dc06d4da1f63b332b284d2e2f51618de472497f5c200505cf10 WHIRLPOOL 82ee6ced8e55166edd41e9ebc9cac16234566ee5cfb25d121d9c6eeca2e29b0c0f2414a9798ca976f46ffc80642dec1e89b9b07377f7f4d3a198ead8e06a8cab
 EBUILD mdds-9999.ebuild 963 SHA256 98530847dfc71ae3f52eab06fd4da033365dedf07d6cac6896d30a125e638380 SHA512 30fc4b8185294db0dc04c3194259961976a48f7ef13944015f5f85b68076bd959f4674513366ec5c8b138c53cd43ed46d8d213701c7dea36bf87d26532cb7569 WHIRLPOOL d5bb4c82c2764aec3035bd8213154a8951b400b46fb580287344fc9bb82a9f2fd40a093a1315d4d8945fcd0d23067665a0994b1a2b1e472635e76af08b01b5d9
diff --git a/dev-util/mdds/mdds-1.2.2.ebuild b/dev-util/mdds/mdds-1.2.2.ebuild
deleted file mode 100644
index a734248ea263..000000000000
--- a/dev-util/mdds/mdds-1.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-
-inherit toolchain-funcs ${GITECLASS}
-
-DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
-HOMEPAGE="https://gitlab.com/mdds/mdds"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="1/${PV%.*}"
-IUSE="valgrind"
-
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
-
-DOCS=() # buildsystem installs docs
-
-src_prepare(){
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# docs require dev-python/breathe etc., bug #602026
-	econf \
-		--disable-docs \
-		$(use_enable valgrind memory_tests)
-}
-
-src_compile() { :; }
-
-src_test() {
-	tc-export CXX
-	default
-}