gentoo resync : 13.10.2019

5 files changed, 3 insertions, 135 deletions

diff --git a/dev-db/pgrouting/Manifest b/dev-db/pgrouting/Manifest
index 3b9a268cc7d7..b6896078ad15 100644
--- a/dev-db/pgrouting/Manifest
+++ b/dev-db/pgrouting/Manifest
@@ -1,6 +1,3 @@
-DIST pgrouting-2.5.2.tar.gz 7221479 BLAKE2B afbf29b7cbd52df526203198fb76d9e9e37e88a4b92d2139975238a14fe5a30c8102449d157e391913e690129a1ca8ac718763d9242193cac4080bc7347e1553 SHA512 9d9d9ebbcbc003f62bf1f0d548363e756012cdce55a9c3ef56ae9a5a510f25337898becf42f3e04bf10e8d3672ebf698def03833bba33410b65e0d2bdd42aecd
 DIST pgrouting-2.6.2.tar.gz 6065517 BLAKE2B e27e28cf988040de1e894a857e3d210bc7676271f69d898afc2d6116d5b88d87404723b2cb1283ef77b4449b4aa62a03e2dbcd489ac641a4721a596d29f8fecd SHA512 6e37f66e631d0cc87e135be7d095822aae21656bb56b3d18afa5bececaad8cee6324d37e8e152bbf69e3374ded1f10aa4b9a4c52b873e3a4c43e73cd877fddcb
-EBUILD pgrouting-2.5.2.ebuild 1388 BLAKE2B 5b87b2a0af8aa23f1ba34980b3bfa5520aed9f6a35d21c05334bc8bdc43c233efeb3c396e7f7179babf7eb8083c84510d6a6b7f389aabe45b399badad54f2134 SHA512 4c9aa0761df88209b8d3b0c5cc8bbede6dba141f502463778102d0ee6b3d1112ae4de2da1202f4656dedbdcf2b47a96317426195abaa623c94ee5bc0bf57f189
-EBUILD pgrouting-2.6.2-r1.ebuild 1226 BLAKE2B b8775e6ff9cf5898f00ef2a7a2b605f0f223e9e9ff5e06cb8066e318626fd4870d4ea7c37edd90251a9f9bafc2e5f6983a584f8197a77573a2e04f1e25c0e6e0 SHA512 81e203b637c329d4817786fff1e79b22da1f07b3f78f29ba9d8fbf2a747b2b490727d263b39908e1c542c033fef8492269139c2b312f812b8393c17f58b4023b
-EBUILD pgrouting-2.6.2.ebuild 1293 BLAKE2B 78a4d910a7facae8ec70bad522ad1e982e4e951d848104a3186287d155487065139993d9d6093924be70b6bea41fd33370b2b4c05574574b221584a3d3af622b SHA512 827e6629765549d670fd63f31ede456f178456c955734677bb697d4b222772ee717efeea1b049d49bba9b2aa176c8f1e5e2f88734131f414fe160fa499b12b23
-MISC metadata.xml 534 BLAKE2B 3bc33ee8118ea199f4261665ffd62fd7cde78928ed64556ed0ea84346da4405b6f5b4765b9a11c02a9f3e719eac3ff9d8392accd11361372437eea26ac0b6e3c SHA512 2892a64cf6e8e34e1ede87ddbcbaabd7e66bc5a45c5a8e21b33103af83e1a6a92c665fbfc02af6ae8fa6aec9df6ba340a40d3332d2da557789c95a312439a55f
+EBUILD pgrouting-2.6.2-r1.ebuild 1224 BLAKE2B 0f0494dd66f0bd712f5994f57b401daa883b6bb1b190797102d6c0ec5a91b9de0ebdef3e3ae3b29f4ba786ad8541afe5bf766004dc8b4fb119fcbc20e2f94fa3 SHA512 f6d1667a40d3d8c169b9b974cb48d23026a399e7c6609f7996dfa4d1b808d8d6649886134c8a8c7e67690d8c339ef784a63a91a4bc9c664f1e6631a5f0ae8f59
+MISC metadata.xml 457 BLAKE2B d2432768e9244c7648720e1569195498ffa3bda4f862a5b5a2edbbd4383d3ca0ab83063c1004680ea6eb662d74f13c2ec4991baa25365ae9ae8f513b93c973b1 SHA512 bbfc5eec69256ba3addfe5c3158b11b4561b347682474ac2f5ac4cb3be8ca30df130957c751f09d761d3a3d8ad62cf3e59193414a31a9b46d793084285c9406d
diff --git a/dev-db/pgrouting/metadata.xml b/dev-db/pgrouting/metadata.xml
index 01cf346d26bd..a88d76503805 100644
--- a/dev-db/pgrouting/metadata.xml
+++ b/dev-db/pgrouting/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <use>
     <flag name="html">Install HTML formatted documentation</flag>
-    <flag name="drivingdistance">Enable to calculate driving distance</flag>
   </use>
   <upstream>
     <remote-id type="github">pgRouting/pgrouting</remote-id>
diff --git a/dev-db/pgrouting/pgrouting-2.5.2.ebuild b/dev-db/pgrouting/pgrouting-2.5.2.ebuild
deleted file mode 100644
index 7a0afdc63eac..000000000000
--- a/dev-db/pgrouting/pgrouting-2.5.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{4,5,6} 10 )
-POSTGRES_USEDEP="server"
-
-inherit  postgres cmake-utils
-
-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="+drivingdistance doc pdf html"
-
-REQUIRED_USE="html? ( doc ) pdf? ( doc )"
-
-RDEPEND="${POSTGRES_DEP}
-	>=dev-db/postgis-2.0
-	dev-libs/boost
-	drivingdistance? ( sci-mathematics/cgal )
-"
-
-DEPEND="
-	doc? ( >=dev-python/sphinx-1.1 )
-	pdf? ( >=dev-python/sphinx-1.1[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=$(usex doc)
-		-DWITH_DD=$(usex drivingdistance)
-		-DWITH_DOC=$(usex doc)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	local make_opts
-	use doc && make_opts="all doc"
-	cmake-utils_src_make ${make_opts}
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && 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-2.6.2-r1.ebuild b/dev-db/pgrouting/pgrouting-2.6.2-r1.ebuild
index db35bce832a3..fb64a94eecbf 100644
--- a/dev-db/pgrouting/pgrouting-2.6.2-r1.ebuild
+++ b/dev-db/pgrouting/pgrouting-2.6.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://pgrouting.org/"
 LICENSE="GPL-2 MIT Boost-1.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SRC_URI="https://github.com/pgRouting/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 IUSE="pdf html"
 
diff --git a/dev-db/pgrouting/pgrouting-2.6.2.ebuild b/dev-db/pgrouting/pgrouting-2.6.2.ebuild
deleted file mode 100644
index 7690a22ce133..000000000000
--- a/dev-db/pgrouting/pgrouting-2.6.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{4..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="doc pdf html"
-
-REQUIRED_USE="html? ( doc ) pdf? ( doc )"
-
-RDEPEND="${POSTGRES_DEP}
-	>=dev-db/postgis-2.0
-	dev-libs/boost
-	sci-mathematics/cgal
-"
-
-DEPEND="
-	doc? ( >=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=$(usex doc)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	local make_opts
-	use doc && make_opts="all doc"
-	cmake-utils_src_make ${make_opts}
-}
-
-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
-}