commit:     8a730bec465a7b103f6b4b63df9cb2e07d632ae1
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 11:22:46 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 12:23:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a730bec

x11-libs/wxGTK: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 x11-libs/wxGTK/Manifest                          |   5 -
 x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch |  75 ---------
 x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild           | 180 ----------------------
 x11-libs/wxGTK/wxGTK-3.0.3.ebuild                | 140 -----------------
 x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild             | 140 -----------------
 x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild           | 184 -----------------------
 x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild           | 184 -----------------------
 x11-libs/wxGTK/wxGTK-3.0.4.ebuild                | 140 -----------------
 8 files changed, 1048 deletions(-)

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index e98af7ed8c6..bef346b0422 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,8 +1,3 @@
-DIST wxGTK-3.0.3_p20180104.tar.xz 84260 BLAKE2B 
3840a4a202778b3e7df0c3470945dd8f083b1b18aa69013ae59975b368cec4f5e9fea3bdd8a05a200fcd146c8616d2258f0b2ee389a6457a638201a8534f9a18
 SHA512 
840c8248d5a689a462d1dcb9d9962dd453473597d10289802728218a881808f594ff799d2002ceb319d2e79b1b7063d59b181d4a0efff7920a2dee9653b40a72
-DIST wxGTK-3.0.4_p20180507.tar.xz 2972 BLAKE2B 
431855d43aefac6227925195c107b21f7539ca2709c98f6d6beb7d25dbdf8633c61bb160fb4e5c993e97dbddc37cdf90dc7b09753a312c25b16f79f0207cfe98
 SHA512 
9caa7ca3b6f15fd70014ccd4008c4fa76f12cb07d3fc58a8f0d2b9a591cf8be3f0eb40497dc757b9d0a04d26f54296aaa8fe693aa601bb1c058365529bb4bc8b
-DIST wxGTK-3.0.4_p20181106.tar.xz 28448 BLAKE2B 
dbbaaa49cbf03b42089c04d3c6045734f045e5bddc66b72f367f2ba1deed0531280c3bf3db873bf78dd33cee9873e20839ab38b94f90830b48bc1a8122164d02
 SHA512 
d1bde53b4eac1f8e6785379f99d585c926fd132c709ca134d7c8c3d62a2bcf77059b90f25333aa692932888318dadf464620b0a136341217cae7a2cd2c93ab50
 DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 
89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c
 SHA512 
44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9
-DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 
181305a2b8935adee8d50873665bc094f46a061fe1bcf8521f8a4d5613013d6ad58ce172e56118f3833ce3489ab2e919bbd5482445ce55455e696252bb747d3c
 SHA512 
655efde42e467d1d48d8adb95e2394d90cedca8eb6a54a7d53771d3d2d4d5f72637aea6ea12a4c1f570c3905a458aebea067cd74e184c4c85ca73e49e04282cb
-DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B 
ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6
 SHA512 
dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1
 DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B 
ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a
 SHA512 
2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd
 DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 
97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347
 SHA512 
c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158

diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch 
b/x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch
deleted file mode 100644
index 3459e8dc75d..00000000000
--- a/x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Prevent file collisions between multiple installed SLOTs.
-
-  - Don't install wxwin.m4.  It is installed with 
app-eselect/eselect-wxwidgets.
-  - Version the bakefile preset filenames.  Unversioned symlinks to these files
-    are handled by eselect.
-  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
-    installed with eselect-wxwidgets.
-  - Version wxstd.mo and modify AddStdCatalog to use it.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -15213,10 +15213,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) 
$(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) 
$(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) 
$(__basedll___depname) $(__baselib___depname) $(__netdll___depname) 
$(__netlib___depname) $(__coredll___depname) $(__corelib___depname) 
$(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) 
$(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) 
$(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) 
$(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) 
$(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) 
$(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) 
$(__propgriddll___depname) $(__propgridlib___depname) 
$(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) 
$(__stclib___depname) $(__gldll___depname) $(__gllib___depname) 
$(__sound_sdl___depname) $(__webkit2_ext_
 __depname) $(__wxrc___depname) $(__cocoa_res___depname)
- 
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) 
$(__install_wxpng___depname) $(__install_wxjpeg___depname) 
$(__install_wxtiff___depname) $(__install_wxexpat___depname) 
$(__install_wxscintilla___depname) $(__install_monodll___depname) 
$(__install_monolib___depname) $(__install_basedll___depname) 
$(__install_baselib___depname) $(__install_netdll___depname) 
$(__install_netlib___depname) $(__install_coredll___depname) 
$(__install_corelib___depname) $(__install_advdll___depname) 
$(__install_advlib___depname) $(__install_mediadll___depname) 
$(__install_medialib___depname) $(__install_htmldll___depname) 
$(__install_htmllib___depname) $(__install_webviewdll___depname) 
$(__install_webviewlib___depname) $(__install_qadll___depname) 
$(__install_qalib___depname) $(__install_xmldll___depname) 
$(__install_xmllib___depname) $(__install_xrcdll___depname) 
$(__install_xrclib___depname) $(__install_auidll___depname) 
$(__install_auilib___depname) $(__install_ribbondll___depname) 
 $(__install_ribbonlib___depname) $(__install_propgriddll___depname) 
$(__install_propgridlib___depname) $(__install_richtextdll___depname) 
$(__install_richtextlib___depname) $(__install_stcdll___depname) 
$(__install_stclib___depname) $(__install_gldll___depname) 
$(__install_gllib___depname) $(__install_sound_sdl___depname) 
$(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig 
locale_install locale_msw_install $(__cocoa_res_install___depname)
--      $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
--      (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
-       $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
--      (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  
wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py 
$(DESTDIR)$(datadir)/bakefile/presets)
-+      (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
-+      for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
-+      $(INSTALL_DATA) $$i 
$(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
-       $(DYLIB_RPATH_INSTALL)
-       $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
-       for f in setup.h $(RCDEFS_H); do \
-@@ -16101,7 +16101,7 @@ install-wxconfig:
-       $(INSTALL_DIR) $(DESTDIR)$(bindir)
-       $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
-       $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) 
$(DESTDIR)$(libdir)/wx/config
--      (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) 
$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p 
$(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
-+      (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) 
$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p 
$(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
- 
- locale_install: 
-       $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -16109,7 +16109,7 @@ locale_install:
-       $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
-       $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
-       if test -f $(srcdir)/locale/$$l.mo ; then \
--      $(INSTALL_DATA) $(srcdir)/locale/$$l.mo 
$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
-+      $(INSTALL_DATA) $(srcdir)/locale/$$l.mo 
$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
-       fi ; \
-       done
- 
---- a/build/bakefiles/wx.bkl
-+++ b/build/bakefiles/wx.bkl
-@@ -137,7 +137,7 @@
-         <using module="gettext"/>
-         <gettext-catalogs id="locale">
-             <srcdir>$(SRCDIR)/locale</srcdir>
--            <catalog-name>wxstd</catalog-name>
-+            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
-             <linguas>
-                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
-                 zh zh_CN zh_TW
---- a/src/common/translation.cpp
-+++ b/src/common/translation.cpp
-@@ -1458,7 +1458,7 @@ wxArrayString 
wxTranslations::GetAvailableTranslations(const wxString& domain) c
- 
- bool wxTranslations::AddStdCatalog()
- {
--    if ( !AddCatalog(wxS("wxstd")) )
-+    if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) 
wxSTRINGIZE(wxMINOR_VERSION))) )
-         return false;
- 
-     // there may be a catalog with toolkit specific overrides, it is not
---- a/utils/wxrc/Makefile.in
-+++ b/utils/wxrc/Makefile.in
-@@ -125,7 +125,6 @@ distclean: clean
- @COND_USE_XRC_1@      rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) 
$(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
- @COND_USE_XRC_1@      $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
- @COND_USE_XRC_1@      mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) 
$(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@      (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) 
wxrc$(EXEEXT))
- 
- @COND_USE_XRC_1@uninstall_wxrc: 
- @COND_USE_XRC_1@      rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)

diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
deleted file mode 100644
index 4fb40d29f62..00000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2018 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/";
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-       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 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
-
-WXSUBVERSION=${PV}.0-gtk3                      # 3.0.3.0-gtk3
-WXVERSION=${WXSUBVERSION%.*}                   # 3.0.3
-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:1.0[${MULTILIB_USEDEP}]
-                       media-libs/gst-plugins-base:1.0[${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:4 )
-               )
-       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-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-
-PATCHES=(
-       "${WORKDIR}"/wxGTK-3.0.3_p20180104/
-       "${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
-)
-
-src_prepare() {
-       default
-
-       # 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}.mo:" \
-               -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
-               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
-
-       use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-       einstalldocs
-
-       # 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
deleted file mode 100644
index dfd97e693a6..00000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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/";
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-       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 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
-
-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[${MULTILIB_USEDEP}]
-               gstreamer? (
-                       media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-                       media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-               libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-               opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-               tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-               )
-       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-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-PATCHES=(
-       "${WORKDIR}"/wxGTK-3.0.3_p20180104/
-       "${FILESDIR}"/${PN}-3.0.3-collision.patch
-)
-
-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
-                       --disable-webview
-                       $(use_enable gstreamer mediactrl)
-                       $(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
-
-       use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-       einstalldocs
-
-       # 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.4-r1.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild
deleted file mode 100644
index cadb5dd2158..00000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/";
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-       https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20181106.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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
-
-SLOT="3.0"
-
-RDEPEND="
-       dev-libs/expat[${MULTILIB_USEDEP}]
-       sdl? ( media-libs/libsdl2[${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[${MULTILIB_USEDEP}]
-               gstreamer? (
-                       media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-                       media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-               libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-               opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-               tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-               )
-       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-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-PATCHES=(
-       "${WORKDIR}"/wxGTK-3.0.4_p20181106/
-       "${FILESDIR}"/${PN}-3.0.5-collision.patch
-)
-
-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
-                       --disable-webview
-                       $(use_enable gstreamer mediactrl)
-                       $(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
-
-       use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-       einstalldocs
-
-       # 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.4-r300.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
deleted file mode 100644
index cb528081365..00000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/";
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-       https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.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 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
-
-WXSUBVERSION=${PV}.0-gtk3                      # 3.0.3.0-gtk3
-WXVERSION=${WXSUBVERSION%.*}                   # 3.0.3
-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:1.0[${MULTILIB_USEDEP}]
-                       media-libs/gst-plugins-base:1.0[${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:4 )
-               )
-       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-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-
-PATCHES=(
-       "${WORKDIR}"/wxGTK-3.0.4_p20180507/
-       "${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
-)
-
-src_prepare() {
-       default
-
-       # 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}.mo:" \
-               -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
-               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
-
-       use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-       einstalldocs
-
-       # Stray windows locale file, bug #650118
-       local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo"
-       [[ -e ${wxmsw} ]] && rm "${wxmsw}"
-
-       # 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.4-r301.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild
deleted file mode 100644
index 66769f55bf3..00000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/";
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-       https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20181106.tar.xz
-       doc? ( 
https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2
 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
-
-WXSUBVERSION=${PV}.0-gtk3                      # 3.0.3.0-gtk3
-WXVERSION=${WXSUBVERSION%.*}                   # 3.0.3
-WXRELEASE=${WXVERSION%.*}-gtk3                 # 3.0-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./}               # 30-gtk3
-
-SLOT="${WXRELEASE}"
-
-RDEPEND="
-       dev-libs/expat[${MULTILIB_USEDEP}]
-       sdl? ( media-libs/libsdl2[${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:1.0[${MULTILIB_USEDEP}]
-                       media-libs/gst-plugins-base:1.0[${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:4 )
-               )
-       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-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-
-PATCHES=(
-       "${WORKDIR}"/wxGTK-3.0.4_p20181106/
-       "${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
-)
-
-src_prepare() {
-       default
-
-       # 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}.mo:" \
-               -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
-               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
-
-       use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-       einstalldocs
-
-       # Stray windows locale file, bug #650118
-       local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo"
-       [[ -e ${wxmsw} ]] && rm "${wxmsw}"
-
-       # 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.4.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
deleted file mode 100644
index 816f0f1bff0..00000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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/";
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-       https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.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 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
-
-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[${MULTILIB_USEDEP}]
-               gstreamer? (
-                       media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-                       media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-               libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-               opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-               tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-               )
-       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-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-PATCHES=(
-       "${WORKDIR}"/wxGTK-3.0.4_p20180507/
-       "${FILESDIR}"/${PN}-3.0.3-collision.patch
-)
-
-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
-                       --disable-webview
-                       $(use_enable gstreamer mediactrl)
-                       $(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
-
-       use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-       einstalldocs
-
-       # 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
-}

Reply via email to