From: Patrick Lauer <patrick@gentoo.org>
Date: Tue, 7 Apr 2015 06:00:17 +0000 (+0000)
Subject: Bump
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e364c7fc6ed5158a1e29f35ebbae7d282230f786;p=gentoo.git

Bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
---

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index d1626b867c4b..1461c75bc05c 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgis
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.101 2015/03/25 06:02:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.102 2015/04/07 05:59:56 patrick Exp $
+
+*postgis-2.1.7 (07 Apr 2015)
+
+  07 Apr 2015; Patrick Lauer <patrick@gentoo.org> +postgis-2.1.7.ebuild:
+  Bump
 
 *postgis-2.1.6 (25 Mar 2015)
 
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 40e5c2d4e4b7..fa9bf383fca0 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -14,6 +14,7 @@ DIST postgis-2.1.1.tar.gz 6717940 SHA256 f55acf056362e7e78766bec7a403e02a3b6b087
 DIST postgis-2.1.4.tar.gz 6854492 SHA256 cd73c2a38428c8736f6cae73b955aee0bd42f9ca4fd8d93c1af464524cb100fc SHA512 1d7dd2547fe9819addea0c9dfb4f4c78f30593af21f7cf05c4e40c2684ea3e04ad50c1937ba72172c69df713384c866e6a336b6cab733c9dd0f273f41df568d2 WHIRLPOOL f685cb2e991319b1a2f7a54ce050217d8ea636c02491fca2dafb1a2f66fe3548d4daff6d3de67925a700d9de42af29dfc4af0d26727e77f969a100a1fe964567
 DIST postgis-2.1.5.tar.gz 6827999 SHA256 0d0e27f72f12b8dba456fbde25ed0f6913f42baf57332a7f1b9bbc6f29fddbf4 SHA512 c1d186b237114c951feb78e97dc7d69896dcb0884c02e49d93e8602590e82d34a808eb12c127c7dc78db3237ac619709f8bd7febb4670909b03615f8278aede2 WHIRLPOOL c203aa2034e899647139445ce0b1e6e7637a0e2ad3c1f6d4ee1f303d9734b219b68d18fb6d6e7da6c9df53f90e8dfd30ce8d4ab8a6c942b96db7e8b55d632417
 DIST postgis-2.1.6.tar.gz 6803831 SHA256 6ffdf655bc4fca2b5495dd96f44b266e84111912d5c3f91b832023c4fec5c222 SHA512 a6c1263d64f2c1828656d5613840d721fb70ecbdfab3e28099c8f6b80d5404d46a9376913c0ab46c7f1109517c04430800b8c3be0c94d964421c6681afb2f997 WHIRLPOOL 98bfcae992f444b63840a28ef90077c01473ea528aa72ae5fd283b4fdcf7b7e37732afeac1a29fc87e330f687ca491d5afbed44b0792fb00763dc682501d37a3
+DIST postgis-2.1.7.tar.gz 6804372 SHA256 00ab79a3f609d7ea458f6fc358032ad059cb720baf88285243d6436a597a7ec2 SHA512 021fcb73c2109dafb67cb9d459eb08e0da7e55cf1a5fab81115aad3b0a61809b8f83d7a278aa04e41ecd633164e4257a90d5dfc0e81339b0c322e7d41d3c5eae WHIRLPOOL 938cacf1af4ba8a2f0f3bbefe11c0014a31cd331186cd7fc7fc0a242528094efb617326a484bdad76704bfb98fd065a7f280ab663088440af0555fc69862e36b
 EBUILD postgis-2.0.3.ebuild 7184 SHA256 e69433a448a32da4be216062794d5b9966b2809758a2d14f01874113f906b1ac SHA512 d494f1b4b641674c3c77f5f02a3c3683312472760fd8a3e678137ee1e0d953edfc2c333fe15fa1c481eb1776d7300a5edd7178fbb3ad65a68fa9c9553f65d868 WHIRLPOOL 92d81fb840349e2cbed5ed6c2b64f0cdc8df590bbce1ba14254bbc2c8b7629d7a041130d1bc386c59bd1614830a097560b1dfdc25f1cb5e15b8a139b38dc3239
 EBUILD postgis-2.0.6.ebuild 7054 SHA256 dacafa7a1cac3b38fdfa2f853f176330b19ff6358f92c4284b7fb2a8b8c00f07 SHA512 b5a3ebb193c7f493bfa227de173c8cd585ac5e9457de76b200c813bda71c34e3bddcbca3edbd0265435427c34de41872bc790829292a11c6c49954f2435cc324 WHIRLPOOL 02e222f511fd9997ae2c3c29bafcea010571f4dbe75051a87b2a66f988930af492e80a46b0945f693c2e4b0024ec5809815fd7803a13f0250d7e41fda5958bdd
 EBUILD postgis-2.1.0.ebuild 7787 SHA256 548680c7d4094b5ee2df37a438315a56f271be95073a74a81177b9f9c087f9fc SHA512 ee75805aee9acbb01ae361dcbc909a9436ab02308a1b85ed154601f7492b9df221db2f2beef17cb34a7beff499b092b47c6b4c62588c108d019c28e3d1ee0026 WHIRLPOOL cf7c56162e2cf0898b77ba0c38a113f0465ac6d99dc2a3e09b19a0aee2a8e8a22ef1c68d0bafe0cb370407ab8016b2645d92531bd1fc87eb2c9ac35fd469017b
@@ -21,5 +22,6 @@ EBUILD postgis-2.1.1.ebuild 7947 SHA256 5ab269c893c94b1039ea932174406c4fb21481e1
 EBUILD postgis-2.1.4.ebuild 7648 SHA256 becade067efe3d16a3b93bbfbbf6f68d0c43238db12f2937f5187fe45a9f68d5 SHA512 5b4fb251ca51219da55a3e5a069da83e5c95053fb6779d446013d8c98b67d165104db6e207fd1814119c6ec1034a88f7fa44c5839fa83a7b0e0388f0b117f88d WHIRLPOOL e4210e492a9dba07ef811315342622f4730f81d83ba203e919754887bee0aa13548a910e6bdaad5f988d2ee562f2a93b5a01a5d1172fd8dd5934198824faabf5
 EBUILD postgis-2.1.5.ebuild 7648 SHA256 2ef18d72a11cc1a009c9c97faf7fe6b44ec17eb46d40a87e0aecf190b27a9f86 SHA512 696374d25e0364f63ed57650411d864da54398abc3d6b1c06adbd144534a374f2f8801d0042dda2edb3026cea51f128b83a6ecd96fb972f520358c5d3f022c26 WHIRLPOOL 362e7dbfd1509cb676033e439c242f6862b30fd56508cffce52daba23313f14682c831526e20a5166fc78fa3154b4b03d4af0f7442b649872858c3361c7fef66
 EBUILD postgis-2.1.6.ebuild 7645 SHA256 514e17d1684bea770669adb801f98403fb3fcbf4b535352844179e57a95eb604 SHA512 bf77dc5a55bb1f48ccaac6ebff1ac150cdfc5b8af4ee52ed3fc51cbd1f391de5b0fe3074528833e87b412ae7c4f75786193615cf1708c5f8a95694a76405f0bd WHIRLPOOL 5966ba580bd125c840a446901741f5663519e0c47136aeb604ffffc15dc176560338e0ec3e49d2e5753d6c7bcb265703c264e50b9bef6613b770221b6c6c354c
-MISC ChangeLog 14623 SHA256 33fbfd3aaea75a0f354c3d78c16672467a0859034fa67eec6df67e453d6f8406 SHA512 4314353c7ca4135df8a26420add9758d01b094042299f84df8a8f39c88ae43dd3edd399c27a5dfdc0ccd8580cdfe87dabbb619693c5abfcc490f9c8790d70dc6 WHIRLPOOL 790e2f37653d3b9dc6962348244648f83f0904f83a07f7c7e954fe68b88d81970a2498467ae9f3a23fb25d94f5b275d263aff2eb77e00ff95f70524d72a69069
+EBUILD postgis-2.1.7.ebuild 7680 SHA256 ff4a34a105cdd78c9a96f2286a7cec4fef188e94bbe1898ee42e188922f36394 SHA512 e278ee4395baef96eb801aa3b829067b82dbbf55cd1a378211252a94d964d53d4d7e5ec28231eb51547e962c98809477d295ada90083b9072bbbf9e905e97375 WHIRLPOOL fa647f8f06c1e6b9456b373c028155a5301e8db74c5c9de494874c71a69007242141923fae34f64c2f729b537c7f2ff9d3f2f79664c730342dac4a50a2f9b29d
+MISC ChangeLog 14734 SHA256 fef3a0f7701a7ce15348423a12c31b476f137b903b3eb8edca3cfb4192819b5a SHA512 1f3e3ccd68d65eb0e25417fb015fe3457bf6b615dda6ed460c16f060a48847cf365ddd16a344c44d3d337e0a225e0eac9109b4841722f2aae64971a2c8f3abde WHIRLPOOL 13d9a54e0bec2d8be57ff2580597e8d3e3faae0d1093b62b65bcd908909462f9bfc8a0e045c830517770f266022b69bf002b272f1bd76efd11b597cb33b2e481
 MISC metadata.xml 293 SHA256 aba886c4c12c0d9948f277e58a17e155a6d3d7c3424f409a4d4789fb613a5cd3 SHA512 74abb5ec4fae7313859af907a10d68462c185f07923fb4a7aeabcfaea949b6e71647dce38fa6fafcda3e24bbb1f4912fbec2405f5b7bfb4ddf012e59d9e31c01 WHIRLPOOL 9627fa5905b0a0758f64d7d269edbd889f26f6e39a03af6aabdf6b2781d23a581b9b4bc97f06589f997dbc4fa15c83fd149bedc9e12c206904e91af42c1eef84
diff --git a/dev-db/postgis/postgis-2.1.7.ebuild b/dev-db/postgis/postgis-2.1.7.ebuild
new file mode 100644
index 000000000000..a2d0091782f3
--- /dev/null
+++ b/dev-db/postgis/postgis-2.1.7.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.7.ebuild,v 1.1 2015/04/07 05:59:56 patrick Exp $
+
+EAPI="5"
+POSTGRES_COMPAT=( 9.{0,1,2,3,4,5} )
+
+inherit autotools eutils 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 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gtk static-libs test"
+
+RDEPEND="
+		|| (
+			dev-db/postgresql:9.5[server]
+			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-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
+				|| (
+					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 )"
+
+# 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"
+
+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
+	export PGSLOT="$(postgresql-config show)"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
+		"${FILESDIR}/${PN}-2.0-arflags.patch" \
+		"${FILESDIR}/${PN}-2.1.4-pkgconfig-json.patch"
+
+	local AT_M4DIR="macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myargs=""
+	use gtk && myargs+=" --with-gui"
+	econf \
+		--with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
+		${myargs}
+}
+
+src_compile() {
+	emake
+	emake -C topology
+
+	if use doc ; then
+		emake comments
+		emake cheatsheets
+		emake -C doc html
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use doc && emake DESTDIR="${D}" comments-install
+	emake -C topology DESTDIR="${D}" install
+	dobin ./utils/postgis_restore.pl
+
+	dodoc CREDITS TODO loader/README.* doc/*txt
+
+	use doc && dohtml -r doc/html/*
+
+	docinto topology
+	dodoc topology/{TODO,README}
+
+	insinto /etc
+	doins "${FILESDIR}/postgis_dbs"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "To finish installing or updating PostGIS edit:"
+	elog "    ${EROOT%/}/etc/postgis_dbs"
+	elog
+	elog "Then, run:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config(){
+	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
+	source "${EROOT%/}/etc/postgis_dbs"
+	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
+
+	if [[ -n ${configured} ]] ; then
+		einfon "Password for PostgreSQL user '${pguser}': "
+		read -s PGPASSWORD
+		export PGPASSWORD
+		echo
+	else
+		eerror "You must edit:"
+		eerror "    ${EROOT%/}/etc/postgis_dbs"
+		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
+		eerror
+		die "Edit postgis_dbs"
+	fi
+
+	# The server we work with must be the same slot we built against.
+	local server_match
+	server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
+		-Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}")
+	if [[ $? = 0 ]] ; then
+		if [[ $server_match -ne 1 ]] ; then
+			unset PGPASSWORD
+			eerror "Server version must be ${PGSLOT}.x"
+			die "Server version isn't ${PGSLOT}.x"
+		fi
+	else
+		unset PGPASSWORD
+		eerror "Is the server running?"
+		die "Couldn't connect to server."
+	fi
+
+	local retval
+	safe_exit() {
+		unset PGPASSWORD
+		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
+		eend $retval
+		eerror "All actions could not be performed."
+		eerror "Read above to see what failed."
+		eerror "Once you fix the issue, you'll need to edit:"
+		eerror "    ${EROOT%/}/etc/postgis_dbs"
+		eerror "As some things may have succeeded."
+		eerror
+		die "All actions could not be performed"
+	}
+
+	local db
+	for db in ${databases[@]} ; do
+		ebegin "Performing CREATE LANGUAGE on ${db}"
+		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
+		retval=$?
+		# In this case, only error code 1 is fatal
+		[[ $retval == 1 ]] && safe_exit || eend 0
+
+		ebegin "Enabling PostGIS on ${db}"
+		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+			-f "${postgis_path}/postgis.sql"
+		retval=$?
+		[[ $retval == 0 ]] && eend 0 || safe_exit
+	done
+
+	for db in ${templates[@]} ; do
+		ebegin "Creating template database '${db}'"
+		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
+			${db} "PostGIS Template"
+		retval=$?
+		[[ $retval != 0 ]] && safe_exit
+
+		psql -q -U ${pguser} -p ${PGPORT} -c \
+			"UPDATE pg_database \
+			 SET datistemplate = TRUE, datallowconn = TRUE \
+			 WHERE datname = '${db}'"
+		retval=$?
+		[[ $retval != 0 ]] && safe_exit
+
+		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
+		retval=$?
+		# In this case, only error code 1 is fatal
+		[[ $retval == 1 ]] && safe_exit
+
+		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+			-f "${postgis_path}/postgis.sql"
+		retval=$?
+		[[ $retval == 0 ]] && eend 0 || safe_exit
+	done
+
+	for db in ${epsg_databases[@]} ; do
+		ebegin "Adding EPSG to ${db}"
+		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+			-f "${postgis_path}/spatial_ref_sys.sql"
+		retval=$?
+		[[ $retval == 0 ]] && eend 0 || safe_exit
+	done
+
+	for db in ${comment_databases[@]} ; do
+		ebegin "Adding comments on ${db}"
+		local comment_file
+		for comment_file in "${postgis_path}"/*_comments.sql ; do
+			psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
+			retval=$?
+			[[ $retval == 0 ]] && continue || safe_exit
+		done
+		eend 0
+	done
+
+	for db in ${upgrade_from_1_3[@]} ; do
+		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
+		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
+		retval=$?
+		[[ $retval == 0 ]] && eend 0 || safe_exit
+	done
+
+	for db in ${upgrade_from_1_4[@]} ; do
+		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
+		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
+		retval=$?
+		[[ $retval == 0 ]] && eend 0 || safe_exit
+	done
+
+	for db in ${upgrade_from_1_5[@]} ; do
+		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
+		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
+		retval=$?
+		[[ $retval == 0 ]] && eend 0 || safe_exit
+	done
+
+	# Clean up and make it so the user has to edit postgis_dbs again that
+	# way this script won't step on any toes due to user error.
+	unset PGPASSWORD
+	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
+	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
+	einfo
+	einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
+}