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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EF9E6158008 for ; Thu, 15 Jun 2023 09:04:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4214EE07F6; Thu, 15 Jun 2023 09:04:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F867E07F6 for ; Thu, 15 Jun 2023 09:04:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0ACF0340EDF for ; Thu, 15 Jun 2023 09:04:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F72DA8B for ; Thu, 15 Jun 2023 09:04:13 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1686819089.ca7a8f1ece3f2d3b2b3528a375f37aea5f4b1b66.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/grass/Manifest sci-geosciences/grass/grass-8.3.0_rc1.ebuild sci-geosciences/grass/grass-9999.ebuild X-VCS-Directories: sci-geosciences/grass/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: ca7a8f1ece3f2d3b2b3528a375f37aea5f4b1b66 X-VCS-Branch: master Date: Thu, 15 Jun 2023 09:04:13 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9b504f7b-5f16-43d1-9284-e9e6235706f7 X-Archives-Hash: 26feb3c980dd8e8c50ca9eb55f177364 commit: ca7a8f1ece3f2d3b2b3528a375f37aea5f4b1b66 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Thu Jun 8 21:52:52 2023 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Thu Jun 15 08:51:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7a8f1e sci-geosciences/grass: add 8.3.0_rc1 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/31360 Signed-off-by: Andrew Ammerlaan gentoo.org> sci-geosciences/grass/Manifest | 1 + .../grass/{grass-9999.ebuild => grass-8.3.0_rc1.ebuild} | 15 +++++++++++++-- sci-geosciences/grass/grass-9999.ebuild | 10 ++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 72d4208c6be4..3ce763026094 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,2 +1,3 @@ DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3 SHA512 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930 DIST grass-8.2.1.tar.gz 66827246 BLAKE2B d48e9169e7a444ed378b968f7d3cd76a6626c3a8d0ced9191c95842e2180178f9fa40a85b0c6a07742f22029b654f93909cacaef2ef2ed017b545183c7f163a3 SHA512 3d48519881d2ad0862185aa7541f39fd5ba19e53918655962b66855b330d693a1cfe9370c0283eefd49a2813e5e9f3399edc03e4e1e15518106342b3b105c661 +DIST grass-8.3.0RC1.tar.gz 67872978 BLAKE2B 5394d929e5d9aaed157a87a5eef720403cbb82e0900a591f38d7e88c570dbcc22e4aa4cd6bd060f09736700f48426c40da6cdcc22abc6bee8d04af886aa9b805 SHA512 6a74d142061b9b6d7eebc9226ae7b3c0201f8153c5e9d95236ceab143a6a6613d6aba03de59180817ff73f64ed34c5c289bd2d370352f52a8d5eab4d61044ac7 diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-8.3.0_rc1.ebuild similarity index 95% copy from sci-geosciences/grass/grass-9999.ebuild copy to sci-geosciences/grass/grass-8.3.0_rc1.ebuild index 4b7fab7cb764..212d805be495 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-8.3.0_rc1.ebuild @@ -46,6 +46,8 @@ RDEPEND=" >=app-admin/eselect-1.2 $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] + dev-python/ply[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] ') sci-libs/gdal:= @@ -77,7 +79,11 @@ RDEPEND=" tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( - >=dev-python/wxpython-4.1:4.0 + $(python_gen_cond_dep ' + >=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + >=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}] + ') x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM @@ -95,6 +101,11 @@ BDEPEND=" virtual/pkgconfig X? ( dev-lang/swig )" +PATCHES=( + # bug 746590 + "${FILESDIR}/${PN}-flock.patch" +) + pkg_setup() { if use lapack; then local mylapack=$(eselect lapack show) @@ -165,7 +176,7 @@ src_configure() { --with-proj-share="${EPREFIX}"/usr/share/proj/ $(use_with cxx) $(use_with tiff) - $(use_with png) + $(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config) $(use_with postgres) $(use_with mysql) $(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql) diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index 4b7fab7cb764..4a055a1fe3ea 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -46,6 +46,8 @@ RDEPEND=" >=app-admin/eselect-1.2 $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] + dev-python/ply[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] ') sci-libs/gdal:= @@ -77,7 +79,11 @@ RDEPEND=" tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( - >=dev-python/wxpython-4.1:4.0 + $(python_gen_cond_dep ' + >=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + >=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}] + ') x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM @@ -165,7 +171,7 @@ src_configure() { --with-proj-share="${EPREFIX}"/usr/share/proj/ $(use_with cxx) $(use_with tiff) - $(use_with png) + $(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config) $(use_with postgres) $(use_with mysql) $(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)