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 A91BF138206 for ; Sun, 31 Dec 2017 13:27:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E30D5E0848; Sun, 31 Dec 2017 13:27:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 AEAF5E0848 for ; Sun, 31 Dec 2017 13:27:50 +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 DB39C335C32 for ; Sun, 31 Dec 2017 13:27:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FF17126 for ; Sun, 31 Dec 2017 13:27:48 +0000 (UTC) From: "Andrey Grozin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Grozin" Message-ID: <1514726820.75c98d03ea71aad91fdc6aa610dfbfcd9c0bb17f.grozin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/wxmaxima/files/, sci-mathematics/wxmaxima/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild X-VCS-Directories: sci-mathematics/wxmaxima/ sci-mathematics/wxmaxima/files/ X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin X-VCS-Revision: 75c98d03ea71aad91fdc6aa610dfbfcd9c0bb17f X-VCS-Branch: master Date: Sun, 31 Dec 2017 13:27:48 +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: 1651beb7-a168-4e99-8f61-3c8dc9c91b08 X-Archives-Hash: 5049a3da205db96180cc41bbf8e29d8b commit: 75c98d03ea71aad91fdc6aa610dfbfcd9c0bb17f Author: Andrey Grozin gentoo org> AuthorDate: Sun Dec 31 13:25:55 2017 +0000 Commit: Andrey Grozin gentoo org> CommitDate: Sun Dec 31 13:27:00 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c98d03 sci-mathematics/wxmaxima: use wxwidgets.eclass Closes: https://bugs.gentoo.org/642734 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch | 8 -------- sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild | 11 ++++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/sci-mathematics/wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch b/sci-mathematics/wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch deleted file mode 100644 index b08434061d3..00000000000 --- a/sci-mathematics/wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -r -U3 wxmaxima-Version-17.10.1.orig/src/CMakeLists.txt wxmaxima-Version-17.10.1/src/CMakeLists.txt ---- wxmaxima-Version-17.10.1.orig/src/CMakeLists.txt 2017-10-22 12:45:56.000000000 +0700 -+++ wxmaxima-Version-17.10.1/src/CMakeLists.txt 2017-12-28 21:29:58.389806037 +0700 -@@ -1,3 +1,4 @@ -+set(wxWidgets_CONFIG_OPTIONS --toolkit=gtk2 --version=3.0) - find_package(wxWidgets REQUIRED std xml html adv aui core net base richtext) - - include(${wxWidgets_USE_FILE}) diff --git a/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild index 52fa2ddc14e..c121ca2e948 100644 --- a/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild +++ b/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 - +WX_GTK_VER="3.0" PLOCALES="ca cs da de el es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW" -inherit cmake-utils l10n xdg-utils gnome2-utils +inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit" HOMEPAGE="http://andrejv.github.io/wxmaxima/" @@ -18,17 +18,14 @@ S="${WORKDIR}"/${PN}-Version-${PV} DEPEND=" dev-libs/libxml2:2 - x11-libs/wxGTK:3.0" + x11-libs/wxGTK:${WX_GTK_VER}" RDEPEND="${DEPEND} media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima" -PATCHES=( - "${FILESDIR}"/${PN}-require-wxGTK-3.0.patch -) - src_prepare() { + setup-wxwidgets cmake-utils_src_prepare sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \