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 9DAEC138331 for ; Thu, 24 May 2018 09:36:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AAC3E0823; Thu, 24 May 2018 09:36:18 +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 1F845E0823 for ; Thu, 24 May 2018 09:36:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 5C1F6335C43 for ; Thu, 24 May 2018 09:36:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B72529E for ; Thu, 24 May 2018 09:36:14 +0000 (UTC) From: "Amy Liffey" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Liffey" Message-ID: <1527154511.61b391d8ec3b65bba588f2ea645bf1f8e8ed4417.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/grass/grass-7.2.0-r1.ebuild X-VCS-Directories: sci-geosciences/grass/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Liffey X-VCS-Revision: 61b391d8ec3b65bba588f2ea645bf1f8e8ed4417 X-VCS-Branch: master Date: Thu, 24 May 2018 09:36:14 +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: 1667b57d-a5fa-4cb0-b1bb-771aafca981f X-Archives-Hash: 28564cf27f27c1e833c14479c1d17d36 commit: 61b391d8ec3b65bba588f2ea645bf1f8e8ed4417 Author: Amy Liffey gentoo org> AuthorDate: Thu May 24 08:05:28 2018 +0000 Commit: Amy Liffey gentoo org> CommitDate: Thu May 24 09:35:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61b391d8 sci-geosciences/grass: fdo-mime to xdg-utils eclass - Remove epatch - Add = to zlib and fftw3 - Remove multilib eclass Package-Manager: Portage-2.3.24, Repoman-2.3.6 sci-geosciences/grass/grass-7.2.0-r1.ebuild | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild index 233823e1fa4..4c924ed1659 100644 --- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild +++ b/sci-geosciences/grass/grass-7.2.0-r1.ebuild @@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite" # bug 572440 WANT_AUTOCONF="2.1" WX_GTK_VER=3.0 -inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools +inherit autotools gnome2 python-single-r1 versionator wxwidgets xdg-utils MY_PM=${PN}$(get_version_component_range 1-2 ${PV}) MY_PM=${MY_PM/.} @@ -32,8 +32,8 @@ RDEPEND="${PYTHON_DEPS} sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= - sys-libs/zlib - fftw? ( sci-libs/fftw:3.0 ) + sys-libs/zlib:= + fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) blas? ( virtual/blas sci-libs/cblas-reference ) @@ -121,9 +121,7 @@ src_prepare() { sed -e 's:\(#include \):#ifdef HAVE_OGR\n\1\n#endif:' \ -i "${S}/vector/v.external/main.c" || die "failed to sed main.c" - epatch "${PATCHES[@]}" - - eapply_user + default eautoconf ebegin "Fixing python shebangs" @@ -254,14 +252,14 @@ src_install() { pkg_postinst() { if use X; then - fdo-mime_desktop_database_update + xdg_desktop_database_update gnome2_icon_cache_update fi } pkg_postrm() { if use X; then - fdo-mime_desktop_database_update + xdg_desktop_database_update gnome2_icon_cache_update fi }