commit: e90eb3dd1e96d0a52c0223f88150284638b9dd4d Author: Patrick Lauer <patrick <AT> gentoo <DOT> org> AuthorDate: Sun Oct 20 16:19:28 2019 +0000 Commit: 罗百科 <patrick <AT> gentoo <DOT> org> CommitDate: Sun Oct 20 16:20:05 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90eb3dd
dev-db/postgis: Bump to 3.0.0 final Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org> dev-db/postgis/Manifest | 3 +- ...stgis-3.0.0_rc2.ebuild => postgis-3.0.0.ebuild} | 4 +- dev-db/postgis/postgis-3.0.0_alpha4.ebuild | 123 --------------------- 3 files changed, 3 insertions(+), 127 deletions(-) diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest index 7d118266bd3..72d18f4734e 100644 --- a/dev-db/postgis/Manifest +++ b/dev-db/postgis/Manifest @@ -4,5 +4,4 @@ DIST postgis-2.4.8.tar.gz 12846228 BLAKE2B dc7cd26f08774011bddba362040f35fd46dab DIST postgis-2.5.1.tar.gz 16041872 BLAKE2B 589cf7168d3698737a19d817b8efb91695c2c3f63d6c3aa24189d9a37459a28ca8a7db0450aa2d557699f76cd8e3ab1eec198bd332b294d976330fdc9d8a7f60 SHA512 c6c9c8c5befd945614e92d1062df1d753ca8b7fd69b70226065c2dac77a59783b14ece4da994187079b683ee090ba5a79389ba679f22fce8c20a5afc2c8dfca0 DIST postgis-2.5.2.tar.gz 16252761 BLAKE2B 181ecc41e659c1df32392d0dfea9cc081c2a647fd23401b8b0470f99e1136b6b8ed900eaea38afdf87cc801bf13ede4247f9c188fcf0da6782624239c77b434f SHA512 b10781f0b74bad8162c33eb111a6090fba184b45fe5874d22cd3a5b0acfb057f3407c073bc44c9d4cd20ed8c2cb1fbb34480b0cf331340bc8b52580d4eccb819 DIST postgis-2.5.3.tar.gz 16424752 BLAKE2B 94c2ccd41eb88a39c6db48ad7f4d142742a1b0791e3abe57adb2c778406dcc8286afc6d55c80067e0b94a1300eff1c76a227d3cfd813e12541c715edeea11a9b SHA512 1c9f873ba8f8ff4aeae248c68c001eb4174416de1e00ce6a0d0c9ea129b475e887a83235027068d52f587ab95c549adbfaa7e5dccdda77855e39c55dac0fdc2d -DIST postgis-3.0.0alpha4.tar.gz 17488411 BLAKE2B ef819793ee431e54ab69e9434d45fc9c59ecb014dc18ccfb93705bc0ec6dec99ec05cedf687db17a8d65da5b6f2bd8760589ed00d1c51328f84f01461deb0922 SHA512 85eb8380772e7be0520617b23d74ab729be0a2ea6f2cbea4f765f38c9522312366723b6972f75017e7675e32b89692c2c25f7e355a18edf1fbb84d4eaa10e52a -DIST postgis-3.0.0rc2.tar.gz 17524319 BLAKE2B c538b9bf1813272fa5bdf3c842e483fac5b4285d2704988ff2a7601a4fcdb8e8966b3e884a4c8b5e37ca65c6ce6536524994c6a2f26d0c76ae5c4ec803525176 SHA512 479ddb9c59ca13b7b0f0003a60f0bce1acb07fbd580b071e6c5f693f7dfa62459ae8d6a44d24081bf34f942dcabbd3eacc5f455d26c6935d2d02032039fa0748 +DIST postgis-3.0.0.tar.gz 17359802 BLAKE2B aa83bdc2d1950c517f99cbdd877eb7261f6c29ce2cbd9f67f1e606c290080fc3d02ab0b7ceb68ce852e0c0d3d4b7753f03cb5b0921da164ab65d68e23d1df538 SHA512 82c233681fa6444686f9979768e5d6d3a9b6ca9cbd4fc2b14bd0a5d1269a8d0f45ee067e64984077063407c7abc13fa0e37a29928d7ccbfe3a61b694f592bed2 diff --git a/dev-db/postgis/postgis-3.0.0_rc2.ebuild b/dev-db/postgis/postgis-3.0.0.ebuild similarity index 97% rename from dev-db/postgis/postgis-3.0.0_rc2.ebuild rename to dev-db/postgis/postgis-3.0.0.ebuild index 50dc1cf0aa5..9a383102a77 100644 --- a/dev-db/postgis/postgis-3.0.0_rc2.ebuild +++ b/dev-db/postgis/postgis-3.0.0.ebuild @@ -17,14 +17,14 @@ HOMEPAGE="http://postgis.net"; SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="address-standardizer doc gtk static-libs mapbox test topology" RDEPEND=" ${POSTGRES_DEP} dev-libs/json-c:= dev-libs/libxml2:2 - >=sci-libs/geos-3.5.0 + >=sci-libs/geos-3.6.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 address-standardizer? ( dev-libs/libpcre ) diff --git a/dev-db/postgis/postgis-3.0.0_alpha4.ebuild b/dev-db/postgis/postgis-3.0.0_alpha4.ebuild deleted file mode 100644 index 4376ffab4a3..00000000000 --- a/dev-db/postgis/postgis-3.0.0_alpha4.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -POSTGRES_COMPAT=( 9.{5..6} {10..12} ) -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="" -IUSE="address-standardizer doc gtk static-libs mapbox test topology" - -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 - 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 - || ( - 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" - -# 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" - - use address-standardizer || myargs+=" --without-address-standardizer" - use mapbox || myargs+=" --without-protobuf" - use topology || myargs+=" --without-topology" - - 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"; -}
