gentoo resync : 31.01.2018

11 files changed, 7 insertions, 720 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 49a4086a1d80..6e7668149ea0 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 6e4a3fcdb242..9c62f6adc6dd 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -4,7 +4,7 @@ DIST cairo-1.14.10.tar.xz 36251788 BLAKE2B 2015594f2a263250b7fd924840155aa3f813e
 DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B 3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e SHA512 ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
 DIST cairo-1.14.8.tar.xz 35392464 BLAKE2B d1d8b283bc55bcb8f34a1e1d8dd6384292c128e38589672f404ee1d15b32004398c3b4668737e1ef34a58b841445530603c9105644076cbda289ec576c55a252 SHA512 dfe77a01ca72e21e11610243a5f6e92e6b0821c4ace11686fb0bac8f0bf9217a79974ff46bdf3d19fd85173f5f24f2c3f6d4e00cf729a55a6492e6798d6c4ec2
 EBUILD cairo-1.14.10.ebuild 3948 BLAKE2B 1d0341e593ec6a05f3d085e794e78e80d8e77c97d48ed18a48531a40afa1976c24128942ed44059616597816f9eeb812d091740279eb3ecb7e5246ed48de85a9 SHA512 c7a336a2ac1479f437b8004c5ad4b38756b1056f1cb9d0ab4dcca97e1eb61c240114f867ee66e9cff1273156f5c6a472cca1c7ccbfac7a7b283c98c03c1d4a62
-EBUILD cairo-1.14.12.ebuild 3948 BLAKE2B 40bfabe3a256a14d6fb8e047d5166af72bfa26d4d7f3182db9be87219f2916af9d063f370e307e257bf18b5c9b45799e7f781ac983522579f12588964e031da7 SHA512 8b12411f00c69c25d91d0e91571a043680779e0658672ea525baf5234f56a2b1d4be8e9989e2ce23ff3f417c9ee7a043d3d36176b7d9f2fe458dff157278137b
+EBUILD cairo-1.14.12.ebuild 3946 BLAKE2B 572d2c003c75b5dc60d25d4de373fde0956eb80124381fb242b1ec1efa6d962f3d1b2dbd88ad3a9abf532a46eb94117b9c4465d5c948bbada69bfeb9c4f1565d SHA512 3b6c9befab40c42b011cd76fe66659c43a28fdf07f69566360db4bccfe3d97b684776af7f0f91d7e1d923c12fc1cc2fb2552410c4251cfd0ec58641bd47425d6
 EBUILD cairo-1.14.8.ebuild 3969 BLAKE2B 446cac4d88e0805ded1a3ca9702eb58ff0b78c5c7038dc4a4671f8677b1ef8d0e88c75d94e16a0366652835f83c542e5841c645160203ce3f3fa4006b16c5f4c SHA512 32250d74eb8508f601bb35096c2446bcf67494bad7d7e4402173044e46d9842c5c8c00361b8884a05fb7f2f5b58f90283e0a0a11036ec71814c4853676d66f97
 EBUILD cairo-9999.ebuild 3997 BLAKE2B ab2fb119f30ab78b474e42a342893dbf0157c89b37cef389d17abe614fc349de707e29b71f27c3aa46c1e84ab4f9c308636a444296cfea459ceeedd0f2e4345a SHA512 5ba225067a8b9def6881f0eb57f57dc2916d0f695bd74d48f2d2def24f413a18dcb37b81879193adf63e949e719c997cc11f6fd4ff5b746cf944f9757e03ee7a
 MISC metadata.xml 821 BLAKE2B 849b86bb474319b9787ec50aa29354fa84a2decdf36074e6618a2a5f1c120c48470c4a54ac7ad8e1c34e9d79b190e1b265f8eaa4f8179c15fb1679d4e35b9ffe SHA512 f15c40e43476dbf8ea426092f80110f10fc3acf3035b57b1d25a94cb4437252cdbee59fca5f054248c62eecf75afe49ab4ba8b12818e8f571217899c2b536ec5
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild b/x11-libs/cairo/cairo-1.14.12.ebuild
index 1d8b4ec96d4d..3fae774cbb92 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.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
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 810ff4050f02..f3e6a48efb6d 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -2,5 +2,5 @@ DIST libxklavier-5.3.tar.xz 315684 BLAKE2B f0aade6788a834eff74b33ed0df6af3651142
 DIST libxklavier-5.4.tar.bz2 390428 BLAKE2B 3cd109c6200ef977533d39b1362c33f871c2cd0b011779b726546aa7dc95bf7dc89931dff7ca2e9a012a51aeec602a53df499591ab30e1dd813fcc823318a2e2 SHA512 e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30989612bd71a5f890be52ff843465162dbbe0bfc9004da76e1d47158a4671b8f915e51c91f9d82f7baae
 EBUILD libxklavier-5.3-r1.ebuild 1178 BLAKE2B 40d13db2e20be4466e822b7358c92a6bd18df3768bc737da8c50e771d6286a637987a77d581384e090f58044abb4137e8a676ed61815bfdaad8a64a0b1c20009 SHA512 74dd647b2e1ce0c2788de30da4b82aaecb3fc63bcdc2074efcd09640b10ec11528d81144fb45e95de06246750163a8d4a288089bc3fe87bbe58b2c1262c6ab26
 EBUILD libxklavier-5.3.ebuild 1279 BLAKE2B 95e9d6d74a8aac0cf7e4ec3bf38807aec35c41f3a75c24edd424967e87b441cddeb513fc9182d0b18c4c2176101cdf788324fc26cb359179fa67699af3415064 SHA512 5b2e76069674dfde5fd44201a3af4dfc3202ace10393fc95cdb4dc1fb74cab834521bcf4813d3f4248452348c3c3d3d849082fd811412a1a21915ccd1f3030f4
-EBUILD libxklavier-5.4.ebuild 1348 BLAKE2B c8958e5cac6515d1ed4258cf06c73ab69588347053a76e289f6c0494d1c821884b0faffac1dea6c3744453762743182cfcf47e50c564c7b648f4e93305231ef0 SHA512 32a884dc32bdeee3e69a2937e95fe726c267f2cfd92b7822da11096d624c3e25b7945544f8fb02c35b9cefb686156a9dc9772e3b1beb3d297bbf790e7bce1a66
+EBUILD libxklavier-5.4.ebuild 1347 BLAKE2B 4182e06bda0bc84d2152b2037c97f66685d9e2653f4603ddd959be1cef6c447e99de33e83a4e0a300508ffd9dbe6d219b318fe29ef709f812a9b91a7ffe17065 SHA512 64fc3122dd9ac03e8c631b296a29f6813459f1146aa0230e8661996c9be6ddc0182b2076652a4421ee95fd95c15f9d417633a63f62e2ae1a86bf4237f2d21fc9
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-libs/libxklavier/libxklavier-5.4.ebuild b/x11-libs/libxklavier/libxklavier-5.4.ebuild
index e7f89aa747fd..93b3e94fdcfe 100644
--- a/x11-libs/libxklavier/libxklavier-5.4.ebuild
+++ b/x11-libs/libxklavier/libxklavier-5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~svu/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 6a758d3e2430..d72d566265dd 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -19,11 +19,7 @@ DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873
 DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1
 EBUILD wxGTK-2.8.12.1-r1.ebuild 4152 BLAKE2B 377a87f514995551172b0109c160bd1cf409c77a95848ee64dd3bcfc78f95bd4a1eba30fb096d3e407440560598b4309b26a520122a3326fc8d71cf7c6787df2 SHA512 2a5fb7445ab1c9ca6eb08fdf0e706eaee89adc4fb27849cd4c0b6209d91912847ad5f3e39ff0f281d86478e28ca98c37686c62842a69c212b7254e9c04aceb4e
 EBUILD wxGTK-2.8.12.1-r2.ebuild 4790 BLAKE2B 556048e9d98cf57dbbf2cf5097101e1640576a0df596e296f0e500d672b417ab530f37469e8bd5cb8c656fe902c572ee4998782bd6a7b8dfd735f87d2f85e681 SHA512 688c1121691fcfd701f6b396aff2425e8aac5eaa644cf1e8d216145b975fb7edef709eae4e9ef0e847f1c3c189685b75f86791487dd4ac71edca579a49f896ee
-EBUILD wxGTK-3.0.2.0-r1.ebuild 4051 BLAKE2B 291462d3bbe810046dd17bfc1625becc03425734c6793f7631547a1b0971924c22222bf2ded65ae5c7251d789d4047f506a717bdcc59329dcb920af55c315178 SHA512 e7ddae3503b886212fc6963331599ae0f8e41265306094e1c04e945c2152dce9b93fd5d6f18e5a2b3e309ec882fb52ef5463c3711244a717e03b7fd8e4405633
-EBUILD wxGTK-3.0.2.0-r2.ebuild 4321 BLAKE2B 89c98fc8d165ce80648d56ddd9329d6af27818bc16b97288bb5b4ecedcb99048165a261635d397b4798edd95349f8c1029ae30d08427abb692a2bff15ade0c57 SHA512 8aaa7909c0a305ac22b57538674d763f97fc336067b417c5a428d4c1ddbb8864d6fdb2aa9a6a70c28eb989179b3a629270e4d97763b26f42e79ee404df6857cf
 EBUILD wxGTK-3.0.2.0-r3.ebuild 4539 BLAKE2B 2ec974f3cc0b2e4426030ca1a16564e2c9e215ce5f2479180fe88b4e04a91c4cbbe91c789e21ae738139554a482c4c45801ac63fa598d319bab09b549e091928 SHA512 442db7de10d3d4b069ef19485cb882966c0b20f7da41f36cf00a054b74214f81b04915fcf637190458a91e00b22acc0d33114dc40dad557ce856962e41cd5204
-EBUILD wxGTK-3.0.2.0-r300.ebuild 5062 BLAKE2B 971833ccf9e6b4761f5760a6f9ea2e060df4efcf2ba36b19351499413dee08fbe573f18a2b044e18438639d663cda6ab4e67b40951818c20ebb50bb2b7f1eadf SHA512 666d0c45c7711fa5883e5b5b99a0b84e3e85ef1a1060ebff57e14f562c0f6d17de0605507bdb6c90483d8c516917d7620aad9ed213dcca613b1c1d2326799531
-EBUILD wxGTK-3.0.2.0-r301.ebuild 5292 BLAKE2B 9ff8380ead99e923c1fdb32066d9519400321918011c94012117be87dd524e787d418a9434f5a1eb6443c9b44db68f7360c725f8cc8869141027ccc394c6f5cc SHA512 309f9f41afc1fff5001f9a01189c022bb9c40a2f4bfb66dfc4f41361cff9e6214f68f5f5110364b53dab3cdb0c28c7b1bb96893262829c3f54301f5e8723a970
 EBUILD wxGTK-3.0.3-r300.ebuild 5176 BLAKE2B 80083420300535ba88704b9c25271931de3ce9da76ac40db0aae31cafccf5794fb737e10bb1ebd0f4a443d73a0cfbc510228d056ffc367ac8d9872beae59d870 SHA512 bc531ed938cc83bbd6ec1fcd30b71991f718cafdc6e6701ce9fa8b32e5f937feac8dbf1092fc87b3b41112ddb9fae5b7ba7dd95cb88b5df9f5da89588387fd80
-EBUILD wxGTK-3.0.3.ebuild 4100 BLAKE2B 9dbb3627f0e19b6eb9be35c536adbba0af8523da99320759c7ccbf1e0862e7c1ca769662cb06f2e99e60819ad8dc484c26c7984be80fd0c30ba1cdd31f89b352 SHA512 d288ea76dcac332438e33ca3c72ab46fb9bd8dcd0ac42677638b60b094d4375419147846d4fee39885066ddec69ef9afb941e2d3c6cf9b9d9cf59739d5c38479
+EBUILD wxGTK-3.0.3.ebuild 4099 BLAKE2B 98fa102f37e980bd4c97b4211e775f704703edc504d4b76910f723b8797bb771a35b78bfbfa76f8ab9f78ad5542d810e1ece92d4368b1366a4252b99096a6093 SHA512 19123b886e87fa7b2a973ef21f3d889641ceb21f36dd62ddf663115cddccf9f72f1b2bb401b99289cf318150a0b09d25a2397f124d3a37929644e68cabf8e65a
 MISC metadata.xml 856 BLAKE2B 9f03dc05155eba5aee9ca7233d96dc7d0929df2a016dce4131b3b639358eea8ebbecfb5e7f59e7382f5467259885c14bcdc3df416a678f213cd58cd3096b4252 SHA512 f5308ab2b8d9d1964c23b175b30c6e728b16522a09a9cf907789a72296b4703f1da9a7b4d116d14cfffb8b38513d4c2830a70acb98b2df62a5dc67ed4e069abb
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
deleted file mode 100644
index a1edca1d410a..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-
-# we use the wxPython tarballs because they include the full wxGTK sources and
-# docs, and are released more frequently than wxGTK.
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
-
-SLOT="3.0"
-
-RDEPEND="
-	dev-libs/expat
-	sdl?    ( media-libs/libsdl )
-	X?  (
-		>=dev-libs/glib-2.22:2
-		media-libs/libpng:0=
-		sys-libs/zlib
-		virtual/jpeg:0=
-		>=x11-libs/gtk+-2.18:2
-		x11-libs/gdk-pixbuf
-		x11-libs/libSM
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		gstreamer? (
-			media-libs/gstreamer:0.10
-			media-libs/gst-plugins-base:0.10 )
-		libnotify? ( x11-libs/libnotify )
-		opengl? ( virtual/opengl )
-		tiff?   ( media-libs/tiff:0 )
-		webkit? ( net-libs/webkit-gtk:2 )
-		)
-	aqua? (
-		x11-libs/gtk+:2[aqua=]
-		virtual/jpeg:0=
-		tiff?   ( media-libs/tiff:0 )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	opengl? ( virtual/glu )
-	X?  (
-		x11-proto/xproto
-		x11-proto/xineramaproto
-		x11-proto/xf86vidmodeproto
-		)"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3
-		GPL-2
-		doc?	( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
-
-	# https://bugs.gentoo.org/421851
-	# https://bugs.gentoo.org/499984
-	# https://bugs.gentoo.org/536004
-	sed \
-		-e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" \
-		-e 's:3\.0\.1:3.0.2:g' \
-		-e 's:^wx_release_number=1$:wx_release_number=2:' \
-		-i configure || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			$(use_enable gstreamer mediactrl)
-			$(use_enable webkit webview)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	mkdir "${S}"/wxgtk_build
-	cd "${S}"/wxgtk_build
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-src_compile() {
-	cd "${S}"/wxgtk_build
-	emake
-}
-
-src_install() {
-	cd "${S}"/wxgtk_build
-
-	emake DESTDIR="${D}" install
-
-	cd "${S}"/docs
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	if use doc; then
-		dohtml -r "${S}"/docs/doxygen/out/html/*
-	fi
-
-	# Stray windows locale file, causes collisions
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
deleted file mode 100644
index 1bdc96a9e5a0..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-
-# we use the wxPython tarballs because they include the full wxGTK sources and
-# docs, and are released more frequently than wxGTK.
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
-
-SLOT="3.0"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl?    ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-	X?  (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		webkit? ( net-libs/webkit-gtk:2 )
-		)
-	aqua? (
-		x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X?  (
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/xineramaproto[${MULTILIB_USEDEP}]
-		x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-	)"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3
-		GPL-2
-		doc?	( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
-	epatch_user
-
-	# https://bugs.gentoo.org/536004
-	sed \
-		-e 's:3\.0\.1:3.0.2:g' \
-		-e 's:^wx_release_number=1$:wx_release_number=2:' \
-		-i "${S}"/configure || die
-
-}
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			$(use_enable gstreamer mediactrl)
-			$(multilib_native_use_enable webkit webview)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	if use doc; then
-		dodoc -r "${S}"/docs/doxygen/out/html
-	fi
-
-	# Stray windows locale file, causes collisions
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r300.ebuild
deleted file mode 100644
index 923d52191666..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r300.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-
-# we use the wxPython tarballs because they include the full wxGTK sources and
-# docs, and are released more frequently than wxGTK.
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
-
-WXSUBVERSION=${PV}-gtk3					# 3.0.2.0-gtk3
-WXVERSION=${WXSUBVERSION%.*}			# 3.0.2
-WXRELEASE=${WXVERSION%.*}-gtk3			# 3.0-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./}		# 30-gtk3
-
-SLOT="${WXRELEASE}"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl?    ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-	X?  (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		webkit? ( net-libs/webkit-gtk:2 )
-		)
-	aqua? (
-		x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X?  (
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/xineramaproto[${MULTILIB_USEDEP}]
-		x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-	)"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3
-		GPL-2
-		doc?	( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-
-src_prepare() {
-	# Versionating
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		-e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
-		-e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
-		-e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
-		-e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}:" \
-		-e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}:" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		utils/wxrc/Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
-		-e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
-		-e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
-		-e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
-		configure || die
-
-	default
-}
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-gtk=3
-			--with-libpng=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			$(use_enable gstreamer mediactrl)
-			$(multilib_native_use_enable webkit webview)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	if use doc; then
-		dodoc -r "${S}"/docs/doxygen/out/html
-	fi
-
-	# Unversioned links
-	rm "${D}"/usr/bin/wx{-config,rc}
-
-	# version bakefile presets
-	pushd "${D}"usr/share/bakefile/presets/ > /dev/null
-	for f in wx*; do
-		mv "${f}" "${f/wx/wx30gtk3}"
-	done
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild
deleted file mode 100644
index 5f3a10b15618..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-
-# we use the wxPython tarballs because they include the full wxGTK sources and
-# docs, and are released more frequently than wxGTK.
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
-
-WXSUBVERSION=${PV}-gtk3					# 3.0.2.0-gtk3
-WXVERSION=${WXSUBVERSION%.*}			# 3.0.2
-WXRELEASE=${WXVERSION%.*}-gtk3			# 3.0-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./}		# 30-gtk3
-
-SLOT="${WXRELEASE}"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl?    ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-	X?  (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		webkit? ( net-libs/webkit-gtk:3 )
-		)
-	aqua? (
-		x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X?  (
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/xineramaproto[${MULTILIB_USEDEP}]
-		x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-	)"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3
-		GPL-2
-		doc?	( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-PATCHES=(
-	"${FILESDIR}"/${P}-webview-fixes.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-	default
-
-	local f
-	for f in $(find "${S}" -name configure.in); do
-		mv "${f}" "${f/in/ac}" || die
-	done
-	AT_M4DIR="${S}/build/aclocal" eautoreconf
-
-	# Versionating
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		-e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
-		-e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
-		-e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
-		-e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}:" \
-		-e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}:" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		utils/wxrc/Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
-		-e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
-		-e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
-		-e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
-		configure || die
-}
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-gtk=3
-			--with-libpng=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			$(use_enable gstreamer mediactrl)
-			$(multilib_native_use_enable webkit webview)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	if use doc; then
-		dodoc -r "${S}"/docs/doxygen/out/html
-	fi
-
-	# Unversioned links
-	rm "${D}"/usr/bin/wx{-config,rc}
-
-	# version bakefile presets
-	pushd "${D}"usr/share/bakefile/presets/ > /dev/null
-	for f in wx*; do
-		mv "${f}" "${f/wx/wx30gtk3}"
-	done
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
index 135db8994cc8..dd1694bac44b 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"