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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5F99D158086 for ; Wed, 8 Dec 2021 05:13:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A24892BC005; Wed, 8 Dec 2021 05:13:32 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 643AA2BC005 for ; Wed, 8 Dec 2021 05:13:32 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 799373432E0 for ; Wed, 8 Dec 2021 05:13:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 194F614D for ; Wed, 8 Dec 2021 05:13:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1638940398.910b07df93db62c0a48ee5cbaa865e7ded05a976.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/postgis/postgis-9999.ebuild X-VCS-Directories: dev-db/postgis/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 910b07df93db62c0a48ee5cbaa865e7ded05a976 X-VCS-Branch: master Date: Wed, 8 Dec 2021 05:13:30 +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: 3a032c56-4be6-4425-8816-55df40c93b42 X-Archives-Hash: a58ef8bce7f3fef58e1a86e48f073bd8 commit: 910b07df93db62c0a48ee5cbaa865e7ded05a976 Author: Sam James gentoo org> AuthorDate: Wed Dec 8 05:13:09 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Dec 8 05:13:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=910b07df dev-db/postgis: update EAPI 6 -> 7 (sync live ebuild) Signed-off-by: Sam James gentoo.org> dev-db/postgis/postgis-9999.ebuild | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dev-db/postgis/postgis-9999.ebuild b/dev-db/postgis/postgis-9999.ebuild index 8325204434e1..298c281eae44 100644 --- a/dev-db/postgis/postgis-9999.ebuild +++ b/dev-db/postgis/postgis-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -POSTGRES_COMPAT=( 9.6 {10..12} ) +POSTGRES_COMPAT=( 9.6 {10..14} ) POSTGRES_USEDEP="server" -inherit autotools eapi7-ver postgres-multi +inherit autotools postgres-multi toolchain-funcs MY_P="${PN}-$(ver_rs 3 '')" @@ -25,9 +25,9 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" -IUSE="address-standardizer doc gtk static-libs test topology" +IUSE="address-standardizer doc gtk static-libs topology" -REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" +REQUIRED_USE="${POSTGRES_REQ_USE}" # Needs a running psql instance, doesn't work out of the box RESTRICT="test" @@ -36,7 +36,7 @@ RDEPEND="${POSTGRES_DEP} dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= - >=sci-libs/geos-3.6.0 + >=sci-libs/geos-3.9.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) @@ -50,10 +50,13 @@ DEPEND="${RDEPEND} dev-libs/libxslt virtual/imagemagick-tools[png] ) - test? ( dev-util/cunit ) " -PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-2.2.0-arflags.patch" + "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch" + "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch" +) src_prepare() { default @@ -78,8 +81,9 @@ src_prepare() { } src_configure() { + export CPP=$(tc-getCPP) + local myeconfargs=( - --with-protobuf # funky misdetection if enabled but --without-protobuf $(use_with address-standardizer) $(use_with gtk gui) $(use_with topology)