| 1 |
commit: a7b5ceb63979bfc49d87f0c14a97b7bf9ca07784 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 4 02:03:08 2018 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 4 17:17:42 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7b5ceb6 |
| 7 |
|
| 8 |
x11-libs/wxGTK: Port to EAPI-6 |
| 9 |
|
| 10 |
SLOT=3.0 only, 3.0-gtk3 already was, so this is done based on that to also reduce delta. |
| 11 |
Also removes some extra whitespaces that don't seem to give any indent value to me |
| 12 |
(though some are kept, that do line things up a bit better). |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 15 |
|
| 16 |
x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild | 12 +++++------- |
| 17 |
x11-libs/wxGTK/wxGTK-3.0.3.ebuild | 22 +++++++++------------- |
| 18 |
2 files changed, 14 insertions(+), 20 deletions(-) |
| 19 |
|
| 20 |
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild |
| 21 |
index 2034d74a130..e7b417b265a 100644 |
| 22 |
--- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild |
| 23 |
+++ b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild |
| 24 |
@@ -1,7 +1,7 @@ |
| 25 |
# Copyright 1999-2018 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
-EAPI="6" |
| 29 |
+EAPI=6 |
| 30 |
|
| 31 |
inherit autotools multilib-minimal |
| 32 |
|
| 33 |
@@ -22,8 +22,8 @@ SLOT="${WXRELEASE}" |
| 34 |
|
| 35 |
RDEPEND=" |
| 36 |
dev-libs/expat[${MULTILIB_USEDEP}] |
| 37 |
- sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) |
| 38 |
- X? ( |
| 39 |
+ sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) |
| 40 |
+ X? ( |
| 41 |
>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] |
| 42 |
media-libs/libpng:0=[${MULTILIB_USEDEP}] |
| 43 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 44 |
@@ -52,7 +52,7 @@ RDEPEND=" |
| 45 |
DEPEND="${RDEPEND} |
| 46 |
virtual/pkgconfig[${MULTILIB_USEDEP}] |
| 47 |
opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) |
| 48 |
- X? ( |
| 49 |
+ X? ( |
| 50 |
x11-proto/xproto[${MULTILIB_USEDEP}] |
| 51 |
x11-proto/xineramaproto[${MULTILIB_USEDEP}] |
| 52 |
x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] |
| 53 |
@@ -60,9 +60,7 @@ DEPEND="${RDEPEND} |
| 54 |
|
| 55 |
PDEPEND=">=app-eselect/eselect-wxwidgets-20131230" |
| 56 |
|
| 57 |
-LICENSE="wxWinLL-3 |
| 58 |
- GPL-2 |
| 59 |
- doc? ( wxWinFDL-3 )" |
| 60 |
+LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" |
| 61 |
|
| 62 |
S="${WORKDIR}/wxWidgets-${PV}" |
| 63 |
|
| 64 |
|
| 65 |
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild |
| 66 |
index d428facde8e..2f84b71d6cd 100644 |
| 67 |
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild |
| 68 |
+++ b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild |
| 69 |
@@ -1,9 +1,9 @@ |
| 70 |
# Copyright 1999-2018 Gentoo Foundation |
| 71 |
# Distributed under the terms of the GNU General Public License v2 |
| 72 |
|
| 73 |
-EAPI="5" |
| 74 |
+EAPI=6 |
| 75 |
|
| 76 |
-inherit eutils multilib-minimal |
| 77 |
+inherit multilib-minimal |
| 78 |
|
| 79 |
DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" |
| 80 |
HOMEPAGE="https://wxwidgets.org/" |
| 81 |
@@ -17,8 +17,8 @@ SLOT="3.0" |
| 82 |
|
| 83 |
RDEPEND=" |
| 84 |
dev-libs/expat[${MULTILIB_USEDEP}] |
| 85 |
- sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) |
| 86 |
- X? ( |
| 87 |
+ sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) |
| 88 |
+ X? ( |
| 89 |
>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] |
| 90 |
media-libs/libpng:0=[${MULTILIB_USEDEP}] |
| 91 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 92 |
@@ -45,7 +45,7 @@ RDEPEND=" |
| 93 |
DEPEND="${RDEPEND} |
| 94 |
virtual/pkgconfig[${MULTILIB_USEDEP}] |
| 95 |
opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) |
| 96 |
- X? ( |
| 97 |
+ X? ( |
| 98 |
x11-proto/xproto[${MULTILIB_USEDEP}] |
| 99 |
x11-proto/xineramaproto[${MULTILIB_USEDEP}] |
| 100 |
x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] |
| 101 |
@@ -53,16 +53,12 @@ DEPEND="${RDEPEND} |
| 102 |
|
| 103 |
PDEPEND=">=app-eselect/eselect-wxwidgets-20131230" |
| 104 |
|
| 105 |
-LICENSE="wxWinLL-3 |
| 106 |
- GPL-2 |
| 107 |
- doc? ( wxWinFDL-3 )" |
| 108 |
+LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" |
| 109 |
|
| 110 |
S="${WORKDIR}/wxWidgets-${PV}" |
| 111 |
- |
| 112 |
-src_prepare() { |
| 113 |
- epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch |
| 114 |
- epatch_user |
| 115 |
-} |
| 116 |
+PATCHES=( |
| 117 |
+ "${FILESDIR}"/${PN}-3.0.0.0-collision.patch |
| 118 |
+) |
| 119 |
|
| 120 |
multilib_src_configure() { |
| 121 |
local myconf |
Archives