From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 97AC61382C5 for ; Thu, 4 Jan 2018 17:18:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1FCEE096C; Thu, 4 Jan 2018 17:18:58 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C53EFE096C for ; Thu, 4 Jan 2018 17:18:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 594A6335C36 for ; Thu, 4 Jan 2018 17:18:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EAA811A2 for ; Thu, 4 Jan 2018 17:18:54 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1515086262.a7b5ceb63979bfc49d87f0c14a97b7bf9ca07784.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/wxGTK/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild x11-libs/wxGTK/wxGTK-3.0.3.ebuild X-VCS-Directories: x11-libs/wxGTK/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: a7b5ceb63979bfc49d87f0c14a97b7bf9ca07784 X-VCS-Branch: master Date: Thu, 4 Jan 2018 17:18:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ec5c1c4a-d10a-498c-9f0d-4e5bbfab66e7 X-Archives-Hash: de1966b4459a17f38fccec3b55c54096 commit: a7b5ceb63979bfc49d87f0c14a97b7bf9ca07784 Author: Mart Raudsepp gentoo org> AuthorDate: Thu Jan 4 02:03:08 2018 +0000 Commit: Mart Raudsepp gentoo 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