Fix bug 528584. Use grep instead of cut.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

4 files changed, 23 insertions, 29 deletions

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index 6f6b3087e589..6bbb0446b8cb 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/postgis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.94 2014/11/05 16:09:12 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.95 2014/11/08 12:51:46 titanofold Exp $
+
+  08 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> postgis-2.0.6.ebuild,
+  postgis-2.1.4.ebuild:
+  Fix bug 528584. Use grep instead of cut.
 
 *postgis-2.1.4 (05 Nov 2014)
 *postgis-2.0.6 (05 Nov 2014)
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 890f4e15d941..eb50f87bb485 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -16,16 +16,16 @@ DIST postgis-2.1.0.tar.gz 6518378 SHA256 fc00481aec904661f3eb11da4305b1666f2040c
 DIST postgis-2.1.1.tar.gz 6717940 SHA256 f55acf056362e7e78766bec7a403e02a3b6b087a6d18b4222647b6a932d5c945 SHA512 f85c4d1db32802b3acbda3f4c391ca961bf1301c699a00682265c7a984fbc74ee7b9fbfc5580fc04dff0491921eb6dbe4d8bd73dded216794a4b7f90c3ed650f WHIRLPOOL 807d0ce975b72315a72d4c2ecd192c612b00530a7e542b18429fed0c69cf6cb95285554c34be58e3d2a2c513f436289449dfbe82c7430fba87e901a4bea49c2d
 DIST postgis-2.1.4.tar.gz 6854492 SHA256 cd73c2a38428c8736f6cae73b955aee0bd42f9ca4fd8d93c1af464524cb100fc SHA512 1d7dd2547fe9819addea0c9dfb4f4c78f30593af21f7cf05c4e40c2684ea3e04ad50c1937ba72172c69df713384c866e6a336b6cab733c9dd0f273f41df568d2 WHIRLPOOL f685cb2e991319b1a2f7a54ce050217d8ea636c02491fca2dafb1a2f66fe3548d4daff6d3de67925a700d9de42af29dfc4af0d26727e77f969a100a1fe964567
 EBUILD postgis-2.0.3.ebuild 7188 SHA256 82363577ee497a8b8155b362a0b9617f3786f1f1fb4f07e54de0761b916d59f6 SHA512 6c05a1537cf8e4cbcbe2203a3a05af31d6309d315ab685b4882ee041adf9258733faa88af4748a087a48d1749af544b0533d3ffd77c7f77913994a57292e9bb4 WHIRLPOOL 1e3dfc9043891c5f6d88b5e911dd74f7a606ca9a4c12b20462043a8f218056ff5d68c7b2c725584e66569e1a3471492c8373d28af8813f880407b929ffd9da0b
-EBUILD postgis-2.0.6.ebuild 7245 SHA256 9487ceaef9876671c5713197534d2790fef0da46d67e7def87bee2e3cda72594 SHA512 0d5f3c961b08d2131f6cd4513a8af93931ecf59bdb6562b455f4ae29ef9c253db2e6e0d49d0a04cdbe8d9f9f237d640b7840fd6944358e0294b6cc53d50eb395 WHIRLPOOL c49597e246e1d9418ca3c17608cead7a22d7838e9117623c66bec15a441ba2b76104e11652fb31c0ce4dfd9c91067fa14b96a2fb09bed90c1159f7f6b5da2997
+EBUILD postgis-2.0.6.ebuild 7058 SHA256 67b6b8014fc5875586e01fde3194df4acf00644b432526435e5c6dcf06a92e90 SHA512 ef0a0e195fe47849bc02e175eaa0668ebf2a8359145b20c595752ebe1ee99045b70e1d8930f837eb825c779a9b4568feeb1df0730af4de58c7cc37f1b32ea0ed WHIRLPOOL 4d8d88dd25e55564d3b587388eb61593b25137a64ff795a79535059ddb20607f3e679e6c609773cdae1453d32fe583369822315999972f94b9838f3972aca6c1
 EBUILD postgis-2.1.0.ebuild 7791 SHA256 9eb718523c8ab27c3ebaa62023d5af1db52e2c147f000f3ca0b6c6fb1f8ce001 SHA512 fd286e608350d6e17908c685a751ce550393d85b4a50bd822226d13ffc0a05775a34a2f4bccdbf87807766e405baea9f1e816ee0a60bcb3b1b7f77714bb8ae95 WHIRLPOOL 676b896e122ac6adbade50bedba2280293e6b154188381c0e79f218708801211ff8532e19018671e747d86a87cdb2bff4ff27f4473f02dcd97d1b2ee7e426eb3
 EBUILD postgis-2.1.1.ebuild 7955 SHA256 b7afc5f5ec12b8cb0c7dc810525365135241d16ddf3873db660d1106056d2c44 SHA512 cfff7d798a843217384175134fd7beb6bbbc056641da1c10c4537c4cf0276991c7b4fe94795f013d90faa9c9b287866d4b41d0705abd9cf2b335fd4038ec9a2e WHIRLPOOL 565dacb6aec53cb3aa69cb991d8e44bc81894f895464cb0456ea4348556ec3cff319bc0a3ac20ec88e1ab3b08bf94f136f6ed1189ee7e5817d6bde4560579017
-EBUILD postgis-2.1.4.ebuild 7822 SHA256 f97710a58cbad87ada0a104a9352385d69fc66b4c6de28b8c9c4fab42f1adf1f SHA512 0880cf04f9bad21f071791c420a98965e034b3c2c6293de241f5c90eb87007dc1350a8d97175f049bac63e57604148cdc90341e0fa8473bfb7c883fa87bb0cb3 WHIRLPOOL 76112e9ff4564f5f75b37eefde1a6363405c922c58fb0d31589c3be41b6594f274b97944e61ae9aae7edd64093b5e6a25efba6d84f92282efea02479f3bdd28b
-MISC ChangeLog 13679 SHA256 b0517a81d67cc30393abea7c52c9022650887f91bc50ccc22b85c530b9529aed SHA512 36ad02ae73e5193253a5e5b7988e7576a551debfd4fa37f4865df86fe7edd4464b1b6a57a971dadd0f0e70afc4084efa349950bf1c7ccb7c86409a268a1aadf7 WHIRLPOOL 0214d97e59f534a815373591a31074d20d01b4db03b3ddecda1deb6d6f43063c170764bac3950fcb4da65e4b0493934bce9e58097a2aabd416b2df13f3471cc8
+EBUILD postgis-2.1.4.ebuild 7635 SHA256 f60ef07a3c188eb9932979be436ff8cab2563a06f0667efe9674ec48aff1bce8 SHA512 b955f0f5939b2fbe4272c7f005aa6f3428e79805ae2b76605ad400c636bd7350e9f953925f6cbeefccfad9bc9c879ca8bab0aea98e5e2f8f8ba39b892c2ec2bb WHIRLPOOL 60fc08167ad70b229f4df58b9d5d56905383f700aa848c9b95bc3bc6f194ecb073cbd29e18942b2f0e9ef870047bb63c53bb6e6fbdee5ae2bc09f31758c83778
+MISC ChangeLog 13825 SHA256 a2667fdc1d7610c69029e22b7a2ad9ac5d7472729bf3ea75921ff5ef86ff454e SHA512 54b61058b226fe56baac1bc160139da64eb5d11096f82a675ac1a51d39162850e6b41bb28490fe9453794a8caf6a5060ef41a750e2f49a2346a949302f94fd00 WHIRLPOOL 2ae98a50a9a11d8cbbb2b9961d8b43b6680a344e2ae941a4fc5a312d6c9849b1eaec2840594242e3fc6285e29e0256cdaae443af619af4f15c4bf712f2f87432
 MISC metadata.xml 293 SHA256 aba886c4c12c0d9948f277e58a17e155a6d3d7c3424f409a4d4789fb613a5cd3 SHA512 74abb5ec4fae7313859af907a10d68462c185f07923fb4a7aeabcfaea949b6e71647dce38fa6fafcda3e24bbb1f4912fbec2405f5b7bfb4ddf012e59d9e31c01 WHIRLPOOL 9627fa5905b0a0758f64d7d269edbd889f26f6e39a03af6aabdf6b2781d23a581b9b4bc97f06589f997dbc4fa15c83fd149bedc9e12c206904e91af42c1eef84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRaS6oACgkQVxOqA9G7/aAsBAD/X3H2WEGXIx3S1Vgetm9gDAeY
-NaVMdbkEPI0Et/cp6vYA/2YejmUnpL0oCh8edtP8N1gjYeSQI0Sxq5KbNV+x08lF
-=kQI/
+iF4EAREIAAYFAlReEeMACgkQVxOqA9G7/aBslgD/eBnjxSV3WJNn9GRRP9hWjK0u
+u/o7eTT+b9bCinpINHYBAIUiEyu8ZK0PLaY173XjGxsP4RA261wOYGxicq1NbwoX
+=J5gY
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgis/postgis-2.0.6.ebuild b/dev-db/postgis/postgis-2.0.6.ebuild
index 79ed8797caa9..1843fba442c4 100644
--- a/dev-db/postgis/postgis-2.0.6.ebuild
+++ b/dev-db/postgis/postgis-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.6.ebuild,v 1.1 2014/11/05 16:09:12 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.6.ebuild,v 1.2 2014/11/08 12:51:46 titanofold Exp $
 
 EAPI="4"
 
@@ -140,13 +140,11 @@ pkg_config(){
 	fi
 
 	# The server we work with must be the same slot we built against.
-	local server_version
-	server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null)
+	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
-		server_version=$(echo ${server_version} | cut -d " " -f 2 | \
-			cut -d "." -f -2 | tr -d .)
-		if [[ $server_version != ${PGSLOT//.} ]] ; then
+		if [[ $server_match -ne 1 ]] ; then
 			unset PGPASSWORD
 			eerror "Server version must be ${PGSLOT}.x"
 			die "Server version isn't ${PGSLOT}.x"
@@ -260,8 +258,5 @@ pkg_config(){
 	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
 	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
 	einfo
-	einfo "To enable other databases, change the default slot:"
-	einfo "    postgresql-config set <slot>"
-	einfo "Then, emerge this package again:"
-	einfo "    emerge -av =${CATEGORY}/${PF}"
+	einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
 }
diff --git a/dev-db/postgis/postgis-2.1.4.ebuild b/dev-db/postgis/postgis-2.1.4.ebuild
index 5c8ade578625..4e3924cdba5f 100644
--- a/dev-db/postgis/postgis-2.1.4.ebuild
+++ b/dev-db/postgis/postgis-2.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.4.ebuild,v 1.1 2014/11/05 16:09:12 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.4.ebuild,v 1.2 2014/11/08 12:51:46 titanofold Exp $
 
 EAPI="5"
 POSTGRES_COMPAT=( 9.{0,1,2,3,4} )
@@ -167,13 +167,11 @@ pkg_config(){
 	fi
 
 	# The server we work with must be the same slot we built against.
-	local server_version
-	server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null)
+	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
-		server_version=$(echo ${server_version} | cut -d " " -f 2 | \
-			cut -d "." -f -2 | tr -d .)
-		if [[ $server_version != ${PGSLOT//.} ]] ; then
+		if [[ $server_match -ne 1 ]] ; then
 			unset PGPASSWORD
 			eerror "Server version must be ${PGSLOT}.x"
 			die "Server version isn't ${PGSLOT}.x"
@@ -287,8 +285,5 @@ pkg_config(){
 	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
 	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
 	einfo
-	einfo "To enable other databases, change the default slot:"
-	einfo "    postgresql-config set <slot>"
-	einfo "Then, emerge this package again:"
-	einfo "    emerge -av =${CATEGORY}/${PF}"
+	einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
 }