From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/wxGTK/
Date: Thu, 4 Jan 2018 17:18:54 +0000 (UTC) [thread overview]
Message-ID: <1515086262.a7b5ceb63979bfc49d87f0c14a97b7bf9ca07784.leio@gentoo> (raw)
commit: a7b5ceb63979bfc49d87f0c14a97b7bf9ca07784
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 4 02:03:08 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Jan 4 17:17:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7b5ceb6
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
x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild | 12 +++++-------
x11-libs/wxGTK/wxGTK-3.0.3.ebuild | 22 +++++++++-------------
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
index 2034d74a130..e7b417b265a 100644
--- 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 d428facde8e..2f84b71d6cd 100644
--- 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
next reply other threads:[~2018-01-04 17:18 UTC|newest]
Thread overview: 181+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-04 17:18 Mart Raudsepp [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-30 9:04 [gentoo-commits] repo/gentoo:master commit in: x11-libs/wxGTK/ Arthur Zamarin
2025-08-25 0:09 Sam James
2025-08-24 23:44 Sam James
2025-08-24 23:44 Sam James
2025-08-24 23:44 Sam James
2025-08-19 19:07 Eli Schwartz
2025-07-04 19:56 Sam James
2025-07-04 19:56 Sam James
2025-07-03 2:32 Sam James
2025-06-21 11:48 Sam James
2025-06-21 11:45 Arthur Zamarin
2025-06-21 11:43 Sam James
2025-05-26 8:06 Sam James
2025-05-26 7:39 Sam James
2025-05-15 7:11 Sam James
2025-05-15 7:11 Sam James
2025-05-15 7:11 Sam James
2025-05-15 7:11 Sam James
2025-05-15 7:11 Sam James
2025-05-15 7:11 Sam James
2025-05-15 7:11 Sam James
2025-05-13 0:44 Sam James
2025-05-13 0:44 Sam James
2025-05-03 16:50 Arthur Zamarin
2025-05-03 14:35 Arthur Zamarin
2025-04-27 16:54 Eli Schwartz
2025-04-27 10:19 Arthur Zamarin
2025-04-27 9:44 Sam James
2025-04-26 18:22 Sam James
2025-04-26 18:22 Sam James
2025-04-26 18:03 Sam James
2025-04-26 18:03 Sam James
2025-04-11 18:18 Michał Górny
2025-03-29 14:19 Arthur Zamarin
2025-03-29 14:19 Arthur Zamarin
2025-03-29 13:50 Arthur Zamarin
2025-03-29 10:14 Sam James
2025-03-29 10:14 Sam James
2025-03-29 10:14 Sam James
2025-03-29 7:45 Arthur Zamarin
2025-03-14 7:38 Arthur Zamarin
2025-03-14 7:32 Arthur Zamarin
2025-03-10 2:45 Sam James
2025-03-06 7:28 Arthur Zamarin
2025-03-06 7:28 Arthur Zamarin
2025-02-10 9:27 Sam James
2025-01-30 23:51 Eli Schwartz
2024-10-03 10:50 Sam James
2024-08-09 17:19 Sam James
2024-08-09 17:19 Sam James
2024-08-09 17:19 Sam James
2024-08-09 17:19 Sam James
2024-08-09 17:19 Sam James
2024-08-06 0:20 Eli Schwartz
2024-05-28 2:01 Sam James
2024-05-28 1:59 Sam James
2024-05-06 7:09 Mart Raudsepp
2024-03-12 4:29 Ionen Wolkens
2024-03-12 4:29 Ionen Wolkens
2024-03-10 5:08 Ionen Wolkens
2024-01-21 8:57 Sam James
2024-01-18 8:06 Florian Schmaus
2023-11-10 9:16 Joonas Niilola
2023-11-05 13:38 Sam James
2023-11-05 13:38 Sam James
2023-09-22 14:54 Sam James
2023-07-23 16:40 Piotr Karbowski
2023-05-18 12:17 Andreas Sturmlechner
2023-05-01 7:22 Arthur Zamarin
2023-05-01 2:33 Sam James
2023-05-01 2:33 Sam James
2023-05-01 2:31 Sam James
2023-04-30 15:32 Arsen Arsenović
2023-04-25 0:35 Sam James
2023-04-19 11:07 Sam James
2023-04-19 8:44 Arthur Zamarin
2023-04-19 8:29 Arthur Zamarin
2023-03-30 22:59 Arsen Arsenović
2023-03-30 17:29 Arsen Arsenović
2023-02-17 8:40 Arsen Arsenović
2023-02-10 4:51 WANG Xuerui
2023-01-28 23:42 Jonas Stein
2022-12-16 1:40 Sam James
2022-12-04 17:28 WANG Xuerui
2022-10-08 17:58 Sam James
2022-08-23 15:19 David Seifert
2022-08-23 15:19 David Seifert
2022-08-23 9:57 David Seifert
2022-07-18 16:30 Sam James
2022-07-10 22:30 Sam James
2022-07-09 22:57 David Seifert
2022-07-09 12:17 Agostino Sarubbo
2022-07-07 20:10 Arthur Zamarin
2022-07-07 19:44 Sam James
2022-07-07 16:48 Arthur Zamarin
2022-07-07 16:21 Arthur Zamarin
2021-05-13 13:38 David Seifert
2021-04-25 19:13 Mart Raudsepp
2021-03-26 20:32 David Seifert
2021-01-18 19:29 Fabian Groffen
2021-01-06 12:01 Fabian Groffen
2019-09-01 18:10 Mikle Kolyada
2019-08-17 20:22 Sergei Trofimovich
2019-08-17 20:17 Sergei Trofimovich
2019-08-14 7:34 Agostino Sarubbo
2019-08-13 13:51 Agostino Sarubbo
2019-08-13 13:14 Agostino Sarubbo
2019-08-13 11:49 Agostino Sarubbo
2019-08-12 11:58 Aaron Bauman
2019-08-12 9:11 Agostino Sarubbo
2019-08-11 23:03 Thomas Deutschmann
2019-05-20 17:22 Aaron Bauman
2019-01-03 14:58 Sergei Trofimovich
2018-10-06 19:12 Sergei Trofimovich
2018-10-06 19:12 Sergei Trofimovich
2018-09-13 14:31 Tobias Klausmann
2018-08-22 0:38 Mikle Kolyada
2018-08-05 1:03 Thomas Deutschmann
2018-08-03 23:36 Mikle Kolyada
2018-08-02 18:44 Sergei Trofimovich
2018-08-02 18:44 Sergei Trofimovich
2018-05-08 11:39 Mart Raudsepp
2018-04-01 21:44 Sergei Trofimovich
2018-02-23 22:10 Sergei Trofimovich
2018-02-23 5:34 Mart Raudsepp
2018-02-23 5:34 Mart Raudsepp
2018-02-20 8:10 Sergei Trofimovich
2018-02-19 7:50 Jason Zaman
2018-02-18 21:48 Thomas Deutschmann
2018-02-06 15:10 Thomas Deutschmann
2018-02-03 15:39 Mart Raudsepp
2018-01-28 10:11 Tobias Klausmann
2018-01-28 1:46 Mart Raudsepp
2018-01-11 21:55 Sergei Trofimovich
2018-01-10 21:46 Sergei Trofimovich
2018-01-09 22:58 Sergei Trofimovich
2018-01-09 22:26 Sergei Trofimovich
2018-01-09 13:11 Mikle Kolyada
2018-01-04 22:01 Mart Raudsepp
2018-01-04 17:18 Mart Raudsepp
2018-01-04 17:18 Mart Raudsepp
2018-01-04 17:18 Mart Raudsepp
2018-01-04 17:18 Mart Raudsepp
2018-01-04 17:18 Mart Raudsepp
2017-12-21 22:54 Sergei Trofimovich
2017-12-21 22:54 Sergei Trofimovich
2017-11-25 11:55 Markus Meier
2017-11-25 11:55 Markus Meier
2017-11-22 18:28 Tobias Klausmann
2017-11-22 18:27 Tobias Klausmann
2017-11-20 13:50 Manuel Rüger
2017-11-20 13:30 Manuel Rüger
2017-11-19 19:14 Thomas Deutschmann
2017-11-18 22:04 Sergei Trofimovich
2017-11-18 22:04 Sergei Trofimovich
2017-11-18 19:54 Sergei Trofimovich
2017-11-18 19:54 Sergei Trofimovich
2017-11-18 18:55 Sergei Trofimovich
2017-11-18 18:55 Sergei Trofimovich
2017-10-22 23:31 Mart Raudsepp
2017-06-21 9:47 Alexis Ballier
2017-01-06 10:14 Mart Raudsepp
2016-12-30 11:12 Agostino Sarubbo
2016-12-30 9:39 Agostino Sarubbo
2016-10-02 11:24 David Seifert
2016-06-17 1:03 Ryan Hill
2016-06-17 1:03 Ryan Hill
2016-05-27 13:14 Tobias Klausmann
2016-05-19 20:20 Jeroen Roovers
2016-05-13 14:51 Agostino Sarubbo
2016-05-12 23:53 Ryan Hill
2016-04-26 17:28 Markus Meier
2016-04-14 2:34 Ryan Hill
2016-04-14 2:34 Ryan Hill
2016-04-14 2:34 Ryan Hill
2016-04-14 2:34 Ryan Hill
2015-10-20 23:16 Julian Ospald
2015-09-24 7:59 Agostino Sarubbo
2015-09-06 13:25 Agostino Sarubbo
2015-08-18 5:49 Jeroen Roovers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1515086262.a7b5ceb63979bfc49d87f0c14a97b7bf9ca07784.leio@gentoo \
--to=leio@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox