[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

[Patrick Lauer]

commit:     719ed10aeb2bf662b5f35e0cb5497ffbab597b45
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  1 17:55:14 2017 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sun Oct  1 17:55:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719ed10a

dev-db/postgis: Bump

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 dev-db/postgis/Manifest                            |   3 +-
 ...stgis-2.4.0_rc3.ebuild => postgis-2.4.0.ebuild} |   3 +-
 dev-db/postgis/postgis-2.4.0_rc2.ebuild            | 117 ---------------------
 3 files changed, 2 insertions(+), 121 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 1458a9a15c1..5ddfb3b20fb 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -5,5 +5,4 @@ DIST postgis-2.2.2.tar.gz 10071528 SHA256 40232391f8f66a6dc740ebb26088e568c8ccb6
 DIST postgis-2.2.5.tar.gz 10223574 SHA256 1fcd458c1e095236d38e52160be5be0c62163f135d4fe7e2554edee0937ce705 SHA512 13069d6e6c0429acff5d6475d6b75783c3e81bc61fb528c5eba28ff125c31513b8a4df1a0870c4c835560d310bba4abf5ac8b9aa4722731f0988d617eca78ea8 WHIRLPOOL 7b39674f0b85477ad759fcb4237d4572304eead8fec5676e2cd90221a5a564ab607890f44b7ab12602cc48e2345f4f017627ba5c379ae4ec484fcff607d751af
 DIST postgis-2.3.2.tar.gz 11336387 SHA256 e92e34c18f078a3d1a2503cd870efdc4fa9e134f0bcedbbbdb8b46b0e6af09e4 SHA512 d4503959c12e7e269817764e5fae4e567b1765ffe9c857a2382d072a0f159939ddb4f6a57c5ca34b822c585926d0f219f0d788b37e8b06a822ce7c0bcc4e88c6 WHIRLPOOL ff207196df6ab0fd858f93f2ac2b0f8863aab5ad12b0444817f99e7de2a618d6157929302b7199dc8c56d3b6b4b25e6c5bb964a129785e366fd03ae4616051f2
 DIST postgis-2.3.3.tar.gz 11342032 SHA256 723d43a1c8ca4cf06359ec0b7fd5521b355db4e37128a26fb8c661b1fe2fc930 SHA512 c0ec4b4b5c470e5f88d1bb72c528269a0cf954981385580db3333502c2da74e431b5a86e3d6427c839c3d4440122be18a69261c8205aa71c8aa4b790550c5e9c WHIRLPOOL 427d4637e0073ad549cd2e74d117b2dc2b0b0e5fff98f9a0bbee3514c00b3688dd56acd7bb3f1742eda61238cf8c5ab81cea6ead7ea5880261b753a86e0f847e
-DIST postgis-2.4.0rc2.tar.gz 12733657 SHA256 56ee34899a84e1b7bc0c207176f9fbdbbb67b61a74310d66fb87492dbca5b3dc SHA512 f09212c8db13c0bbb6bae7621ab78480c8948702b30158290d9364dd4bcff657f57ed35586aa2cfee48b147059481f9770f0698c518aaf4d1d9fc1b185667537 WHIRLPOOL ff9c073b0289db38426c307ab72be6c4c5e6c90a7ce9f4e89c198eccfb8baf3de04ef0446b21f56db35af37996b06de31ee6d2aaf43f4b8f8b6f05cccb4f08ec
-DIST postgis-2.4.0rc3.tar.gz 12577316 SHA256 5ef68d413b5954d33edd217bfb87438a8b197a18bfaf2f7b8a27272dbe96f888 SHA512 1f53b872bb89a7403e8945260b96b4580f40bd3cb5ade5a72fbfe0e63ec859d9fbe620503867597b18df87356613cf1beb10ad5a6e677846ac80f6686809b7e5 WHIRLPOOL b8a8faf036892a2bd9bc8a54463706c879e378700500cd02701424c28e98df96996f12a5496459bfb1681ab98d1d5d17499cc5c1a96916dc3a420e8710d0bb82
+DIST postgis-2.4.0.tar.gz 12576979 SHA256 02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29 SHA512 813e8e9feb75b58673afaec2dda3b5d8fc586a0f483c553795c8ae2b917bb67a9741e8c901787a0b914c327848323239346f1d816aa60b47d5a7065596de0067 WHIRLPOOL 75403b5d1babdc1d714d29a6c1f86dfcd1503997536d6a35333b6e19c72de44aa131cba3c6a9a4f2ced59a280eb0eaee41696fa8440c2028f8555d6a2c4dcd3b

diff --git a/dev-db/postgis/postgis-2.4.0_rc3.ebuild b/dev-db/postgis/postgis-2.4.0.ebuild
similarity index 97%
rename from dev-db/postgis/postgis-2.4.0_rc3.ebuild
rename to dev-db/postgis/postgis-2.4.0.ebuild
index dedc502a639..18cd48cf450 100644
--- a/dev-db/postgis/postgis-2.4.0_rc3.ebuild
+++ b/dev-db/postgis/postgis-2.4.0.ebuild
@@ -17,8 +17,7 @@ HOMEPAGE="http://postgis.net"
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc gtk static-libs test"
 
 RDEPEND="

diff --git a/dev-db/postgis/postgis-2.4.0_rc2.ebuild b/dev-db/postgis/postgis-2.4.0_rc2.ebuild
deleted file mode 100644
index 057edc60dbd..00000000000
--- a/dev-db/postgis/postgis-2.4.0_rc2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{2..6} )
-POSTGRES_USEDEP="server"
-
-inherit autotools eutils postgres-multi versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS=""
-IUSE="doc gtk static-libs test"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	dev-libs/json-c
-	dev-libs/libxml2:2
-	>=sci-libs/geos-3.5.0
-	>=sci-libs/proj-4.6.0
-	>=sci-libs/gdal-1.10.0
-	gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.5
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick[png]
-					media-gfx/graphicsmagick[imagemagick,png]
-				)
-		)
-		virtual/pkgconfig
-		test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# 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.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	postgres-multi_foreach econf ${myargs}
-}
-
-src_compile() {
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C topology
-
-	if use doc ; then
-		postgres-multi_foreach emake comments
-		postgres-multi_foreach emake cheatsheets
-		postgres-multi_forbest emake -C doc html
-	fi
-}
-
-src_install() {
-	postgres-multi_foreach emake DESTDIR="${D}" install
-	postgres-multi_foreach emake -C topology DESTDIR="${D}" install
-	postgres-multi_forbest dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	if use doc ; then
-		postgres-multi_foreach emake DESTDIR="${D}" comments-install
-
-		docinto html
-		postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
-
-		docinto html/images
-		postgres-multi_forbest dodoc doc/html/images/*
-	fi
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-	ebegin "Refreshing PostgreSQL symlinks"
-	postgresql-config update
-	eend $?
-
-	elog "To finish installing PostGIS, follow the directions detailed at:"
-	elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions"
-}