gentoo (valentine's day) resync : 14.02.2021

4 files changed, 55 insertions, 67 deletions

diff --git a/dev-db/pgrouting/Manifest b/dev-db/pgrouting/Manifest
index 9f0d063c4067..e601352d4a5d 100644
--- a/dev-db/pgrouting/Manifest
+++ b/dev-db/pgrouting/Manifest
@@ -1,7 +1,7 @@
-DIST pgrouting-2.6.2.tar.gz 6065517 BLAKE2B e27e28cf988040de1e894a857e3d210bc7676271f69d898afc2d6116d5b88d87404723b2cb1283ef77b4449b4aa62a03e2dbcd489ac641a4721a596d29f8fecd SHA512 6e37f66e631d0cc87e135be7d095822aae21656bb56b3d18afa5bececaad8cee6324d37e8e152bbf69e3374ded1f10aa4b9a4c52b873e3a4c43e73cd877fddcb
 DIST pgrouting-3.1.1.tar.gz 6133979 BLAKE2B b7657eeb88773773e6166190cda73d9e657774ff81ce7e9f005333a8dcb9d56587d4a793410356092bb1623ec287549dbc60d814b1d5156ff28301503acee776 SHA512 73285d2d47be844203df136b8a8c13d1672ad8c2dac44a1ff7ce16e4676043692a8f2a60a305542132891da83560c49c5eaeb7712e3e3dd250cd8fd550260d4a
 DIST pgrouting-3.1.2.tar.gz 6063893 BLAKE2B a371fb9c744b14072c65af5ceb1ea73d2cdb69821626be3ac79e08c9dee854272ce8cb3816d1de3eade06d50a7520846dd6bccda06934b9db926f9092719f131 SHA512 3cf3e0a4a726f6f11887d15ad71b789a9067f3bc5a675288f22730215aa12d12b94d75f9bdc8ab3077de8368c45c55c0dc27128d0453c4c30965bfc0cf118dcd
-EBUILD pgrouting-2.6.2-r1.ebuild 1224 BLAKE2B d1f10f219e584e2167fbb3351cc35424fb35f10def7e7ba115aa4bec54c259f43e771e47f52d7fddf19c838117d0d265252d4886599ec401020287f590223d35 SHA512 6087d2e8e20c815defe78c440d5ba58e30de353e8ee0722b7347bff79c32ae7abc1d46d48b95c32c0b28db55043f198609217053012134dbfe27b1e879c06eb4
+DIST pgrouting-3.1.3.tar.gz 6057504 BLAKE2B 73bc5d810a2f7bb383ba4fef4ffa52ccb3f21dbc00c68f02665dc459c0e0a2810e0ed10ab73bb3099be5ea6dde86bad884d82039a50c9c4eb423b614845e94b6 SHA512 1051f0a91813ccb3c396c78a059b99839b3352e562372bcc459dfaf289e35ea08bdba8a159032a3df46913548fc717968c187b8c480187497a5b5f7327ca470e
 EBUILD pgrouting-3.1.1.ebuild 1090 BLAKE2B 2a96e7c7baf0b80eb28a2fa633f7c18959f386d4591f07de8e2408fab21b69cce775dd5d8c78c85afc8fb7cf0b52b01d27fcc219a569aa91abff180b28f2a4ac SHA512 fbc6ce99d23055041951490da633ddf8c5467a76b8399e760079a3bf3882dc511104cd6914e99760e39ba7143bc2d545c4af639164ea8aa0040cf9de8bcfacb2
 EBUILD pgrouting-3.1.2.ebuild 1056 BLAKE2B 1fa30057f61f0d7857ddd0e98b577b93321326ef9b6b0a81409c6b5f6d0de621b6f73d7c7c98a61872620ac7fd7d3332421d4f82aeb946f4db0b57af57268606 SHA512 2aeb113d2e83966939215772762645edc9bd607c65735d3edfd54174ed6cca3b9367e7e68cc54a8a33cdb2b3ff5696e372da8e05309b2d35960eb409554a7903
-MISC metadata.xml 457 BLAKE2B d2432768e9244c7648720e1569195498ffa3bda4f862a5b5a2edbbd4383d3ca0ab83063c1004680ea6eb662d74f13c2ec4991baa25365ae9ae8f513b93c973b1 SHA512 bbfc5eec69256ba3addfe5c3158b11b4561b347682474ac2f5ac4cb3be8ca30df130957c751f09d761d3a3d8ad62cf3e59193414a31a9b46d793084285c9406d
+EBUILD pgrouting-3.1.3.ebuild 1056 BLAKE2B 95aa0b132edde82155508bbb42459bdf2722fa2a94ccee97b672cd10f8e1d302f95bbee007784385ca935f1a2fc1a72f7d153361178f16261d81d88eb73ff783 SHA512 9d0ad46998a26f105d3954cd094d8213f69b599dbd6f232242d213416ac7387fe82960652b64e05d8b86e59004b733322bf16a67757261e0f52f3220787caa84
+MISC metadata.xml 374 BLAKE2B 2d62d58c72da287624ca59e6c989089f70314154fd9e74d0c0a0a146ca0c2cd5bbe7bf9cf1bffca979fac52c7929c8335685484cb95e6c2b51a35189854ba953 SHA512 f6288ebdda1cad7cc62ee64fa4f6b9efb2e1c754a9573f489778353e294d0bdfafda74ac6dfa553be0088bc56db65e1527930fb3796f8025c7f44a1da983b7c5
diff --git a/dev-db/pgrouting/metadata.xml b/dev-db/pgrouting/metadata.xml
index a88d76503805..2072ed843440 100644
--- a/dev-db/pgrouting/metadata.xml
+++ b/dev-db/pgrouting/metadata.xml
@@ -5,9 +5,6 @@
     <email>pgsql-bugs@gentoo.org</email>
     <name>PostgreSQL and Related Package Development</name>
   </maintainer>
-  <use>
-    <flag name="html">Install HTML formatted documentation</flag>
-  </use>
   <upstream>
     <remote-id type="github">pgRouting/pgrouting</remote-id>
   </upstream>
diff --git a/dev-db/pgrouting/pgrouting-2.6.2-r1.ebuild b/dev-db/pgrouting/pgrouting-2.6.2-r1.ebuild
deleted file mode 100644
index 00807308c211..000000000000
--- a/dev-db/pgrouting/pgrouting-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{5..6} 10 11 )
-POSTGRES_USEDEP="server"
-
-inherit  postgres cmake-utils
-
-DESCRIPTION="pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality."
-HOMEPAGE="http://pgrouting.org/"
-LICENSE="GPL-2 MIT Boost-1.0"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-SRC_URI="https://github.com/pgRouting/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="pdf html"
-
-RDEPEND="${POSTGRES_DEP}
-	>=dev-db/postgis-2.0
-	dev-libs/boost
-	sci-mathematics/cgal
-"
-
-# Sphinx is needed to build the man pages
-DEPEND="${RDEPEND}
-	>=dev-python/sphinx-1.2
-	pdf? ( >=dev-python/sphinx-1.2[latex] )
-"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-pkg_setup() {
-	postgres_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HTML=$(usex html)
-		-DBUILD_LATEX=$(usex pdf)
-		-DBUILD_MAN=ON
-		-DWITH_DOC=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_make all doc
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	doman "${BUILD_DIR}"/doc/man/en/pgrouting.7
-
-	use html && dodoc -r "${BUILD_DIR}"/doc/html
-	use pdf && dodoc "${BUILD_DIR}"/doc/latex/en/*.pdf
-}
diff --git a/dev-db/pgrouting/pgrouting-3.1.3.ebuild b/dev-db/pgrouting/pgrouting-3.1.3.ebuild
new file mode 100644
index 000000000000..97f11ea503ca
--- /dev/null
+++ b/dev-db/pgrouting/pgrouting-3.1.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE="Release"
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_USEDEP="server"
+
+inherit cmake postgres-multi
+
+DESCRIPTION="pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality."
+HOMEPAGE="https://pgrouting.org/"
+LICENSE="GPL-2 MIT Boost-1.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="https://github.com/pgRouting/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE=""
+
+RDEPEND="${POSTGRES_DEP}
+	>=dev-db/postgis-2.0
+	dev-libs/boost
+	sci-mathematics/cgal
+"
+
+DEPEND="${RDEPEND}"
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+src_prepare() {
+	cmake_src_prepare
+	postgres-multi_src_prepare
+}
+
+my_src_configure() {
+	local mycmakeargs=( -DPOSTGRESQL_BIN="$($PG_CONFIG --bindir)" )
+	cmake_src_configure
+}
+
+src_configure() {
+	postgres-multi_foreach my_src_configure
+}
+
+src_compile() {
+	postgres-multi_foreach cmake_build
+}
+
+src_install() {
+	postgres-multi_foreach cmake_src_install
+}