x11-libs/wxGTK: Port to EAPI-6

SLOT=3.0 only, 3.0-gtk3 already was, so this is done based on that to also reduce delta.
Also removes some extra whitespaces that don't seem to give any indent value to me
(though some are kept, that do line things up a bit better).

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
index 2034d74a13043b9b6ca1e50349a46dc96c3d82b1..e7b417b265a5b204ce8cf153d1eaf4ebeea7fb6b 100644 (file)
--- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit autotools multilib-minimal
 
@@ -22,8 +22,8 @@ SLOT="${WXRELEASE}"
 
 RDEPEND="
        dev-libs/expat[${MULTILIB_USEDEP}]
-       sdl?    ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-       X?  (
+       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}]
@@ -52,7 +52,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        virtual/pkgconfig[${MULTILIB_USEDEP}]
        opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-       X?  (
+       X? (
                x11-proto/xproto[${MULTILIB_USEDEP}]
                x11-proto/xineramaproto[${MULTILIB_USEDEP}]
                x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
@@ -60,9 +60,7 @@ DEPEND="${RDEPEND}
 
 PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
 
-LICENSE="wxWinLL-3
-               GPL-2
-               doc?    ( wxWinFDL-3 )"
+LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
 
 S="${WORKDIR}/wxWidgets-${PV}"
 

diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
index d428facde8ef278229909fa1ac5d9825b3c6fffe..2f84b71d6cd2ec2925fae68a96b165b9dfc61d38 100644 (file)
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
 HOMEPAGE="https://wxwidgets.org/"
@@ -17,8 +17,8 @@ SLOT="3.0"
 
 RDEPEND="
        dev-libs/expat[${MULTILIB_USEDEP}]
-       sdl?    ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-       X?  (
+       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}]
@@ -45,7 +45,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        virtual/pkgconfig[${MULTILIB_USEDEP}]
        opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-       X?  (
+       X? (
                x11-proto/xproto[${MULTILIB_USEDEP}]
                x11-proto/xineramaproto[${MULTILIB_USEDEP}]
                x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
@@ -53,16 +53,12 @@ DEPEND="${RDEPEND}
 
 PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
 
-LICENSE="wxWinLL-3
-               GPL-2
-               doc?    ( wxWinFDL-3 )"
+LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
 
 S="${WORKDIR}/wxWidgets-${PV}"
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
-       epatch_user
-}
+PATCHES=(
+       "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
+)
 
 multilib_src_configure() {
        local myconf