gentoo resync : 02.03.2018

5 files changed, 66 insertions, 276 deletions

diff --git a/dev-db/pgrouting/Manifest b/dev-db/pgrouting/Manifest
index 6cf5682a1f5a..53f8702ff6e8 100644
--- a/dev-db/pgrouting/Manifest
+++ b/dev-db/pgrouting/Manifest
@@ -1,6 +1,3 @@
-AUX no-contrib-when-use-extension.patch 3077 BLAKE2B c9501565e97aeccfb60ad1d6226795bf3c918a0e02f67a26bf0ad8c0333b64e3d99732ac8f85869c25d51b06d5353e7a8cf1e0ffb5d71dc4c92ac418c4ef1786 SHA512 be0e5ad3fe44c8138e44ee61744fb57e9d759cc066619bc0e2d1758d26ef075b88cb52ccea6b6f2e2b5af7e0d5db982a0da0762c54dabccf9f71116ffbad87f4
-DIST pgrouting-2.0.0.tar.gz 3765933 BLAKE2B 3bf574b79851e33bb9b5f99220757c02061ec052027940d73f7e8602e876644a0cb780fb3291c60a6e4fa54d886ed574d2a651971c01cd950778b561356c997f SHA512 4a74cc1ce1bbbb8d95ae2aabc712e30c97e0418b1e4f28a255ecd9e57577bd7081a52e6e64a63cb06c9ca659271273b37bdbefb94d49e69b9c2ce45e96911884
-DIST pgrouting-2.5.0.tar.gz 7157856 BLAKE2B aa9c9afb982e367692aefc07583d0e362503d6c3d4b7d1ec17f6eee60848e8d01a54b520e7417cc92d6fb3f4b526da1826abc7d7e8db88126d8946ae6f699b0b SHA512 663dd5f5133d0bf1bbf7c35480c644ba848e65259023a0ef7f31b813b8ed99a4e2cfb813d870de7550e98ca1f8b0255aa28b2c948d13e8975af9f0d19f820784
-EBUILD pgrouting-2.0.0.ebuild 2283 BLAKE2B 8152a640db0f1918241342d8b42a695ba5b83a0481d1a65eedeeb7f3bedeed5e03e6840664794b3c95d29a4959f54d1bfbad9403006ad7531f23b0e627ff4ff6 SHA512 51ee8a469d30b32df77026e51fa4db70d9c4ad4334c54ed7447c52deba008524b45a56a594825071cc64a0bfb39a919c991ffe3569eca3bb4a79c4e5ff1501e9
-EBUILD pgrouting-2.5.0.ebuild 2172 BLAKE2B 3bf7bc2b610179b3ed0efb91dacd8c14e7c4198761371be605be8eefef2f78218b50d7640ac4818fe5198f41d15bd4481c17d556aecb29c42f9ad278f7d81318 SHA512 23c8b4a82c36958f63bf1cdcfb1e6983efe87db16f0a8e3f4154bb3a4ad2fc0ac2fddffefb3082680b6f9ab76fdf096d5988d00ac49b292f6fee1ec4a2c8cac5
+DIST pgrouting-2.5.2.tar.gz 7221479 BLAKE2B afbf29b7cbd52df526203198fb76d9e9e37e88a4b92d2139975238a14fe5a30c8102449d157e391913e690129a1ca8ac718763d9242193cac4080bc7347e1553 SHA512 9d9d9ebbcbc003f62bf1f0d548363e756012cdce55a9c3ef56ae9a5a510f25337898becf42f3e04bf10e8d3672ebf698def03833bba33410b65e0d2bdd42aecd
+EBUILD pgrouting-2.5.2.ebuild 1387 BLAKE2B 0efdb96f64544c4fcf251515ab1119faa0d613983ae66d4cb3c9f0bcd64eed46044079c831c4bbd1d930300326ddbff85a60219a1a44d8dac6fa468599c08209 SHA512 11d388428235fc68da299adcc02547608c9967c8c5fe1356139742eb070ae59f51ce6207b797a68281e675abeaa2826a6acef17eeb79cb649a20c2bb337b0272
 MISC metadata.xml 534 BLAKE2B 3bc33ee8118ea199f4261665ffd62fd7cde78928ed64556ed0ea84346da4405b6f5b4765b9a11c02a9f3e719eac3ff9d8392accd11361372437eea26ac0b6e3c SHA512 2892a64cf6e8e34e1ede87ddbcbaabd7e66bc5a45c5a8e21b33103af83e1a6a92c665fbfc02af6ae8fa6aec9df6ba340a40d3332d2da557789c95a312439a55f
diff --git a/dev-db/pgrouting/files/no-contrib-when-use-extension.patch b/dev-db/pgrouting/files/no-contrib-when-use-extension.patch
deleted file mode 100644
index e26af3ef0da3..000000000000
--- a/dev-db/pgrouting/files/no-contrib-when-use-extension.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naur pgrouting-2.0.0.orig/CMakeLists.txt pgrouting-2.0.0/CMakeLists.txt
---- pgrouting-2.0.0.orig/CMakeLists.txt	2013-09-24 16:38:31.000000000 -0400
-+++ pgrouting-2.0.0/CMakeLists.txt	2014-11-07 06:48:11.555026180 -0500
-@@ -170,16 +170,13 @@
-   OUTPUT_VARIABLE SHARE_DIR)
- 
- if(SHARE_DIR)
--  # Always install in "contrib" directory of PostgreSQL
--  set(CONTRIB_DIR "${SHARE_DIR}/contrib/pgrouting-${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
--  message(STATUS "Contrib directory for SQL files is set to ${CONTRIB_DIR}")
--
-   # Install as extension if supported by the version of PostgreSQL
-   if(USE_PG_EXTENSION)
-     set(SHARE_DIR "${SHARE_DIR}/extension")
-     message(STATUS "Extension directory for SQL files is set to ${SHARE_DIR}")
--  #else(USE_PG_EXTENSION)
--  #  set(SHARE_DIR "/usr/share/pgrouting")
-+  else(USE_PG_EXTENSION)
-+    set(CONTRIB_DIR "${SHARE_DIR}/contrib/pgrouting-${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
-+    message(STATUS "Contrib directory for SQL files is set to ${CONTRIB_DIR}")
-   endif(USE_PG_EXTENSION)
- else(SHARE_DIR)
-   message(FATAL_ERROR "pg_config --sharedir failed to return a value. Please check your PostgreSQL installation!")
-@@ -347,22 +344,24 @@
- 
- install(FILES ${LIBS_TO_INSTALL}  DESTINATION ${LIB_DIR})
- 
--install(FILES
-+if(USE_PG_EXTENSION)
-+  install(FILES
-     "${CMAKE_BINARY_DIR}/lib/pgrouting--${PGROUTING_VERSION_STRING}.sql"
-     "${CMAKE_BINARY_DIR}/lib/pgrouting.control"
-     "${CMAKE_BINARY_DIR}/lib/pgrouting_legacy.sql"
-     DESTINATION "${SHARE_DIR}")
--
--# The following probably could be done better
--# The idea is to also have a "pgrouting-x.x" directory in PostgreSQL contrib
--configure_file("${CMAKE_BINARY_DIR}/lib/pgrouting--${PGROUTING_VERSION_STRING}.sql"
-+else(USE_PG_EXTENSION)
-+  # The following probably could be done better
-+  # The idea is to also have a "pgrouting-x.x" directory in PostgreSQL contrib
-+  configure_file("${CMAKE_BINARY_DIR}/lib/pgrouting--${PGROUTING_VERSION_STRING}.sql"
-     "${CMAKE_BINARY_DIR}/lib/pgrouting.sql" COPYONLY)
- 
--install(FILES
-+  install(FILES
-     "${CMAKE_BINARY_DIR}/lib/pgrouting.sql"
-     "${CMAKE_BINARY_DIR}/lib/pgrouting.control"
-     "${CMAKE_BINARY_DIR}/lib/pgrouting_legacy.sql"
-     DESTINATION "${CONTRIB_DIR}")
-+endif(USE_PG_EXTENSION)
- 
- # TODO: The following probably should be done better
- if(WITH_DD)
-@@ -372,12 +371,14 @@
-   configure_file("${PGROUTING_SOURCE_DIR}/src/driving_distance/sql/routing_dd_legacy.sql"
-       "${CMAKE_BINARY_DIR}/lib/pgrouting_dd_legacy.sql" COPYONLY)
- 
--  install(FILES
--      "${CMAKE_BINARY_DIR}/lib/pgrouting_dd_legacy.sql"
--      DESTINATION "${SHARE_DIR}")
--
--  install(FILES
--      "${CMAKE_BINARY_DIR}/lib/pgrouting_dd_legacy.sql"
--      DESTINATION "${CONTRIB_DIR}")
-+    if(USE_PG_EXTENSION)
-+      install(FILES
-+	"${CMAKE_BINARY_DIR}/lib/pgrouting_dd_legacy.sql"
-+	DESTINATION "${SHARE_DIR}")
-+    else(USE_PG_EXTENSION)
-+      install(FILES
-+	"${CMAKE_BINARY_DIR}/lib/pgrouting_dd_legacy.sql"
-+	DESTINATION "${CONTRIB_DIR}")
-+    endif(USE_PG_EXTENSION)
- endif(WITH_DD)
- 
diff --git a/dev-db/pgrouting/pgrouting-2.0.0.ebuild b/dev-db/pgrouting/pgrouting-2.0.0.ebuild
deleted file mode 100644
index 7a36fce1799c..000000000000
--- a/dev-db/pgrouting/pgrouting-2.0.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-POSTGRES_COMPAT=( 9.{0,1,2,3,4} )
-
-inherit eutils cmake-utils
-
-DESCRIPTION="pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality."
-HOMEPAGE="http://pgrouting.org/index.html"
-LICENSE="GPL-2 MIT Boost-1.0"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-SRC_URI="https://github.com/pgRouting/pgrouting/archive/v${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
-IUSE="+drivingdistance doc pdf html"
-
-REQUIRED_USE="html? ( doc ) pdf? ( doc )"
-
-RDEPEND="
-	|| (
-		dev-db/postgresql:9.4[server]
-		dev-db/postgresql:9.3[server]
-		dev-db/postgresql:9.2[server]
-		dev-db/postgresql:9.1[server]
-		dev-db/postgresql:9.0[server]
-	)
-	>=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"
-
-postgres_check_slot() {
-	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-		die 'POSTGRES_COMPAT not declared.'
-	fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" \
-	&& -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
-
-	local res=$(echo ${POSTGRES_COMPAT[@]} \
-		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-	if [[ "$res" -eq "0" ]] ; then
-			eerror "PostgreSQL slot must be set to one of: "
-			eerror "    ${POSTGRES_COMPAT[@]}"
-			return 1
-	fi
-
-	return 0
-}
-
-pkg_pretend() {
-	postgres_check_slot || die
-}
-
-pkg_setup() {
-	postgres_check_slot || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/no-contrib-when-use-extension.patch"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with drivingdistance DD)
-		$(cmake-utils_use_with doc DOC)
-		$(cmake-utils_use_build doc MAN)
-		$(cmake-utils_use_build html HTML)
-		$(cmake-utils_use_build pdf LATEX)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	local make_opts
-	use doc && make_opts="all doc"
-	cmake-utils_src_make ${make_opts}
-}
-
-src_install() {
-	use doc && doman "${BUILD_DIR}"/doc/man/en/pgrouting.7
-	use html && dohtml -r "${BUILD_DIR}"/doc/html/*
-	use pdf && dodoc "${BUILD_DIR}"/doc/latex/en/*.pdf
-
-	dodoc README* VERSION
-
-	cmake-utils_src_install
-}
diff --git a/dev-db/pgrouting/pgrouting-2.5.0.ebuild b/dev-db/pgrouting/pgrouting-2.5.0.ebuild
deleted file mode 100644
index 79e1b0aa8f7f..000000000000
--- a/dev-db/pgrouting/pgrouting-2.5.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-POSTGRES_COMPAT=( 9.{4,5,6} 10 )
-
-inherit eutils cmake-utils
-
-DESCRIPTION="pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality."
-HOMEPAGE="http://pgrouting.org/index.html"
-LICENSE="GPL-2 MIT Boost-1.0"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-SRC_URI="https://github.com/pgRouting/pgrouting/archive/v${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
-IUSE="+drivingdistance doc pdf html"
-
-REQUIRED_USE="html? ( doc ) pdf? ( doc )"
-
-RDEPEND="
-	|| (
-		dev-db/postgresql:10[server]
-		dev-db/postgresql:9.6[server]
-		dev-db/postgresql:9.5[server]
-		dev-db/postgresql:9.4[server]
-	)
-	>=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"
-
-postgres_check_slot() {
-	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-		die 'POSTGRES_COMPAT not declared.'
-	fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" \
-	&& -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
-
-	local res=$(echo ${POSTGRES_COMPAT[@]} \
-		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-	if [[ "$res" -eq "0" ]] ; then
-			eerror "PostgreSQL slot must be set to one of: "
-			eerror "    ${POSTGRES_COMPAT[@]}"
-			return 1
-	fi
-
-	return 0
-}
-
-pkg_pretend() {
-	postgres_check_slot || die
-}
-
-pkg_setup() {
-	postgres_check_slot || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with drivingdistance DD)
-		$(cmake-utils_use_with doc DOC)
-		$(cmake-utils_use_build doc MAN)
-		$(cmake-utils_use_build html HTML)
-		$(cmake-utils_use_build pdf LATEX)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	local make_opts
-	use doc && make_opts="all doc"
-	cmake-utils_src_make ${make_opts}
-}
-
-src_install() {
-	use doc && doman "${BUILD_DIR}"/doc/man/en/pgrouting.7
-	use html && dohtml -r "${BUILD_DIR}"/doc/html/*
-	use pdf && dodoc "${BUILD_DIR}"/doc/latex/en/*.pdf
-
-	dodoc README* VERSION
-
-	cmake-utils_src_install
-}
diff --git a/dev-db/pgrouting/pgrouting-2.5.2.ebuild b/dev-db/pgrouting/pgrouting-2.5.2.ebuild
new file mode 100644
index 000000000000..fa48f5a3fb69
--- /dev/null
+++ b/dev-db/pgrouting/pgrouting-2.5.2.ebuild
@@ -0,0 +1,64 @@
+# 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="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="+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
+}