From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-db/postgis/Manifest | 8 -- dev-db/postgis/files/postgis-2.2.0-arflags.patch | 18 --- .../postgis/files/postgis-2.4.2-jsonc_0.13.patch | 23 ---- dev-db/postgis/metadata.xml | 26 ----- dev-db/postgis/postgis-2.4.2.ebuild | 126 --------------------- dev-db/postgis/postgis-2.4.3.ebuild | 126 --------------------- dev-db/postgis/postgis-9999.ebuild | 114 ------------------- 7 files changed, 441 deletions(-) delete mode 100644 dev-db/postgis/Manifest delete mode 100644 dev-db/postgis/files/postgis-2.2.0-arflags.patch delete mode 100644 dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch delete mode 100644 dev-db/postgis/metadata.xml delete mode 100644 dev-db/postgis/postgis-2.4.2.ebuild delete mode 100644 dev-db/postgis/postgis-2.4.3.ebuild delete mode 100644 dev-db/postgis/postgis-9999.ebuild (limited to 'dev-db/postgis') diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest deleted file mode 100644 index 72f2e45d5c64..000000000000 --- a/dev-db/postgis/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX postgis-2.2.0-arflags.patch 535 BLAKE2B 6420573e9623d4e2115ed3616bc3b8648ae7782bf4624ee60d3827a4d61cbdac1dc62b4937f36113ed6d0856af4728f5cc1b544d502512e88dd87a7b590135ab SHA512 7f8b92a582dd11b3040832278b75e65036315ca0e438cb9b19cc5b63a7b5c5bcae8ec274a487a29abadfbbc31cdfacf6c668e46f249d4bf88c09607501cacf66 -AUX postgis-2.4.2-jsonc_0.13.patch 786 BLAKE2B c55fd81f28b9a4db965ef3f4bb3ca6fcf2cd6ba44d4f7a93c35ade90ffdcb195325ce219348aa6dc3645f6822214b4bc75263c02fc316f3dd9b4369114eb5493 SHA512 9088304bb77db2d86dd077510f94ae8b3796474a02377f1f076476c739d9506f0b7c7c6dcf6e90ad51e84bc528302a6ecda4bedc6eac42dfeba3a71c0144a399 -DIST postgis-2.4.2.tar.gz 12470881 BLAKE2B 116bb5d1c8f6066d537cac950254923a681babac456d155139dbdd2853b80499f4f9445dad985b94bffffd1d1285a6c78fee0fccb24e301d18147f3cd9230416 SHA512 e268572d5cd009754ef05f5d2eedcac7e362fa47199459c637cd4d9050d2b648d4b2b3746cde0dce5a42be2606a432b64dc905f193e12cf0869e3dd6f820b425 -DIST postgis-2.4.3.tar.gz 12601055 BLAKE2B 662b2afe145bc23c77ebda7306d07a20e39c1a598316cee58e1591e65ce1b2d2a3f727f5463ba144711faa55f7c11e4a038b6ad2a76cab760b4fdd43647f09c3 SHA512 95b2c925cb10943e7136aa3b7b08a9ad3d6ff59a3994c653bba52e4c65193d519daa49684b924f68945dd596187aa17e0c713bf0b9e29f8c5973346b279dba1b -EBUILD postgis-2.4.2.ebuild 3111 BLAKE2B 5e73b003ce160340df936ffc7571fa4873b1e3cc6519fae8f7f452d98c2c5786c2ecedb96a544bef39f566a28db8089b7f9dfd37e97b910cf33fa83fb0307bcf SHA512 0cd08ef2930688412f1ffe4846ac88a9037f68dda0cde535c810fbbb218f2c033fec74a2f7b1539f0ff42ea40f085ea290fcdd3892fcc27a38fad25085686152 -EBUILD postgis-2.4.3.ebuild 3113 BLAKE2B 4ea7488d7c87a8d946d074d36f306db9791bca9d0d63f7ad67622defd797052fad8d4b0652ef2a3445ee1da436450e2f30683870dcf54de3255db9b61095e2b3 SHA512 a7f5e10d00f67a6f6c322ed59937ccd103e3491b9ae9ffc516240c5185b10ed808b4044e44ab276576e07a5bc34e3f9464abf242623b85e9a718733713cbeb1b -EBUILD postgis-9999.ebuild 2647 BLAKE2B b379c0ebfd30c407817139b72264bbb70c0cae3ba281b2f2ffda38c61c851bb363266e2675437e32dd3ffc80a6c1dca4608e34833d7a729cbd6997eb2501411d SHA512 4b654b604752b9e30ea0662e89429e0deb74e1ce6cfb8beef34f8bf33ea2aeb28e07398828fc5ddc3d27a520258313cb552b7ef24069ca5b9001a4db7aaa1cec -MISC metadata.xml 779 BLAKE2B 9dfbc86514c5f6e0c859dc41a46890e4f518f23c572786bf340112eadf21b35f5f583a3835f6ba58bef8c99a7ef8483f3a98898d372d1c0e5cc537bb9ecc2b12 SHA512 33ad2ddabf49e97af2cf188f2c0f72e1a936c228b43d8d3637230c43be0df82ec2aa20b63cb5f2385e936c215263fcd009332afe504bc5f30746a387b9b37ada diff --git a/dev-db/postgis/files/postgis-2.2.0-arflags.patch b/dev-db/postgis/files/postgis-2.2.0-arflags.patch deleted file mode 100644 index 97770042d8f6..000000000000 --- a/dev-db/postgis/files/postgis-2.2.0-arflags.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naruw a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in ---- a/raster/rt_core/Makefile.in 2015-05-13 14:13:18.000000000 -0400 -+++ b/raster/rt_core/Makefile.in 2015-12-14 16:49:49.166156232 -0500 -@@ -18,7 +18,7 @@ - # - ############################################################################# - --AR = ar rs -+ARFLAGS = rs - - CC = @CC@ - LIBLWGEOM_LDFLAGS = ../../liblwgeom/.libs/liblwgeom.a -@@ -64,4 +64,4 @@ - rm -f Makefile - - librtcore.a: $(RT_OBJS) -- $(AR) $(RT_LIB) $(RT_OBJS) -+ $(AR) $(ARFLAGS) $(RT_LIB) $(RT_OBJS) diff --git a/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch b/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch deleted file mode 100644 index b980e77333d6..000000000000 --- a/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur postgis-2.4.2.old/liblwgeom/lwin_geojson.c postgis-2.4.2/liblwgeom/lwin_geojson.c ---- postgis-2.4.2.old/liblwgeom/lwin_geojson.c 2017-12-21 22:52:40.422802160 +0100 -+++ postgis-2.4.2/liblwgeom/lwin_geojson.c 2017-12-21 22:55:36.605430945 +0100 -@@ -31,13 +31,19 @@ - - #if defined(HAVE_LIBJSON) || defined(HAVE_LIBJSON_C) /* --{ */ - -+#define JSON_C_VERSION_013 (13 << 8) -+ - #ifdef HAVE_LIBJSON_C - #include -+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013 - #include -+#endif - #else - #include -+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013 - #include - #endif -+#endif - - #ifndef JSON_C_VERSION - /* Adds support for libjson < 0.10 */ diff --git a/dev-db/postgis/metadata.xml b/dev-db/postgis/metadata.xml deleted file mode 100644 index 079d84079f20..000000000000 --- a/dev-db/postgis/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - pgsql-bugs@gentoo.org - PostgreSQL and Related Package Development - - - sci-geosciences@gentoo.org - Gentoo Geosciences Project - - - - Normalize US and CA postal addresses - - - Build graphical interface for shp2pgsql (shp2pgsql-gui) - - - Add capability to transform geometry into Mapbox Vector Tile - - - Build topology spatial types and functions - - - diff --git a/dev-db/postgis/postgis-2.4.2.ebuild b/dev-db/postgis/postgis-2.4.2.ebuild deleted file mode 100644 index 2dd323bc6436..000000000000 --- a/dev-db/postgis/postgis-2.4.2.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -POSTGRES_COMPAT=( 9.{3..6} 10 ) -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" -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" - -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" \ - "${FILESDIR}/postgis-2.4.2-jsonc_0.13.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" -} diff --git a/dev-db/postgis/postgis-2.4.3.ebuild b/dev-db/postgis/postgis-2.4.3.ebuild deleted file mode 100644 index a24f81220e5e..000000000000 --- a/dev-db/postgis/postgis-2.4.3.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -POSTGRES_COMPAT=( 9.{3..6} 10 ) -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" -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" - -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" \ - "${FILESDIR}/postgis-2.4.2-jsonc_0.13.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" -} diff --git a/dev-db/postgis/postgis-9999.ebuild b/dev-db/postgis/postgis-9999.ebuild deleted file mode 100644 index 0010979ad4bf..000000000000 --- a/dev-db/postgis/postgis-9999.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -POSTGRES_COMPAT=( 9.{3..6} 10 ) -POSTGRES_USEDEP="server" - -inherit autotools eutils postgres-multi subversion versionator - -MY_PV=$(replace_version_separator 3 '') -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -ESVN_REPO_URI="http://svn.osgeo.org/postgis/trunk/" - -DESCRIPTION="Geographic Objects for PostgreSQL" -HOMEPAGE="http://postgis.net" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="doc gtk static-libs test" - -RDEPEND=" - ${POSTGRES_DEP} - dev-libs/json-c:= - dev-libs/libxml2:2 - >=sci-libs/geos-3.4.2 - >=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 - virtual/imagemagick-tools[png] - ) - virtual/pkgconfig - test? ( dev-util/cunit ) -" - -REQUIRED_USE="test? ( doc )" - -# Needs a running psql instance, doesn't work out of the box -RESTRICT="test" - -MAKEOPTS+=' -j1' - -src_prepare() { - source "${S}"/Version.config - export PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}" - - # 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. - export QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" - - eapply_user - - 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-dev/postgis_installation.html#create_new_db_extensions" -} -- cgit v1.2.3