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 A5A19138350 for ; Tue, 28 Jan 2020 22:13:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D342E0872; Tue, 28 Jan 2020 22:13:27 +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 383CAE0872 for ; Tue, 28 Jan 2020 22:13:27 +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 28C6C34E462 for ; Tue, 28 Jan 2020 22:13:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88D73107 for ; Tue, 28 Jan 2020 22:13:24 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1580249570.9539dbeeeddb6f426318c0a58a085da7980faeb0.asturm@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: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9539dbeeeddb6f426318c0a58a085da7980faeb0 X-VCS-Branch: master Date: Tue, 28 Jan 2020 22:13:24 +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: 64e4bb81-ab02-4537-aec7-fc1de797c52e X-Archives-Hash: 4017ffb77589d0d40bf6ac7f2b75534a commit: 9539dbeeeddb6f426318c0a58a085da7980faeb0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 28 21:44:39 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 28 22:12:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9539dbee dev-db/postgis: git-r3, https, sync w/ 3.0.0, eutils--, eapi7-ver++ Upstream switched to git. Use https links. Use myeconfargs array with inline comments. General overhaul and sync with latest 3.0.0 changes. Add release switch for uniform ebuilds. eutils is not used. Run default, not eapply_user. Closes: https://bugs.gentoo.org/698146 Closes: https://bugs.gentoo.org/691036 Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-db/postgis/postgis-9999.ebuild | 104 +++++++++++++++++++++---------------- 1 file changed, 59 insertions(+), 45 deletions(-) diff --git a/dev-db/postgis/postgis-9999.ebuild b/dev-db/postgis/postgis-9999.ebuild index ef406c8c690..2235d63f8dd 100644 --- a/dev-db/postgis/postgis-9999.ebuild +++ b/dev-db/postgis/postgis-9999.ebuild @@ -1,80 +1,87 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -POSTGRES_COMPAT=( 9.{4..6} {10..12} ) -POSTGRES_USEDEP="server" -inherit autotools eutils postgres-multi subversion versionator +POSTGRES_COMPAT=( 9.{5..6} {10..12} ) +POSTGRES_USEDEP="server" +inherit autotools eapi7-ver postgres-multi -MY_PV=$(replace_version_separator 3 '') -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}/${MY_P}" +MY_P="${PN}-$(ver_rs 3 '')" -ESVN_REPO_URI="http://svn.osgeo.org/postgis/trunk/" +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git" +else + PGIS="$(ver_cut 1-2)" + SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +fi DESCRIPTION="Geographic Objects for PostgreSQL" -HOMEPAGE="http://postgis.net" +HOMEPAGE="https://postgis.net" + +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="address-standardizer doc gtk static-libs mapbox test topology" +IUSE="address-standardizer doc gtk static-libs test topology" -RDEPEND=" - ${POSTGRES_DEP} +REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" + +# Needs a running psql instance, doesn't work out of the box +RESTRICT="test" + +RDEPEND="${POSTGRES_DEP} dev-libs/json-c:= dev-libs/libxml2:2 - >=sci-libs/geos-3.5.0 - >=sci-libs/proj-4.6.0 + dev-libs/protobuf-c:= + >=sci-libs/geos-3.6.0 + >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0 address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) - mapbox? ( dev-libs/protobuf ) " - DEPEND="${RDEPEND} - doc? ( - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.5 - dev-libs/libxslt - virtual/imagemagick-tools[png] - ) - virtual/pkgconfig - test? ( dev-util/cunit ) + virtual/pkgconfig + doc? ( + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.5 + dev-libs/libxslt + virtual/imagemagick-tools[png] + ) + test? ( dev-util/cunit ) " -REQUIRED_USE="test? ( doc )" - -# Needs a running psql instance, doesn't work out of the box -RESTRICT="test" +PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" ) src_prepare() { - source "${S}"/Version.config - export PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}" + default + + if [[ ${PV} = *9999* ]] ; then + source "${S}"/Version.config + PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}" + fi # These modules are built using the same *FLAGS that were used to build # dev-db/postgresql. The right thing to do is to ignore the current # *FLAGS settings. - export QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" - - eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" - eapply_user + QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" local AT_M4DIR="macros" eautoreconf + postgres-multi_src_prepare } src_configure() { - local myargs="" - - use gtk && myargs+=" --with-gui" - - use address-standardizer || myargs+=" --without-address-standardizer" - use mapbox || myargs+=" --without-protobuf" - use topology || myargs+=" --without-topology" - - postgres-multi_foreach econf ${myargs} + local myeconfargs=( + --with-protobuf # funky misdetection if enabled but --without-protobuf + $(use_with address-standardizer) + $(use_with gtk gui) + $(use_with topology) + ) + postgres-multi_foreach econf "${myeconfargs[@]}" } src_compile() { @@ -116,6 +123,13 @@ pkg_postinst() { postgresql-config update eend $? + local base_uri="https://postgis.net/docs/manual-" + if [[ ${PV} = *9999* ]] ; then + base_uri+="dev" + else + base_uri+="${PGIS}" + fi + elog "To finish installing PostGIS, follow the directions detailed at:" - elog "http://postgis.net/docs/manual-dev/postgis_installation.html#create_new_db_extensions" + elog "${base_uri}/postgis_installation.html#create_new_db_extensions" }