Remove pkg_pretend that fails on intial install if pg isn't installed yet

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

4 files changed, 10 insertions, 14 deletions

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index 1461c75bc05c..bd88418ca75e 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,10 @@
 # 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.102 2015/04/07 05:59:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.103 2015/07/08 06:04:05 patrick Exp $
+
+  08 Jul 2015; Patrick Lauer <patrick@gentoo.org> postgis-2.1.6.ebuild,
+  postgis-2.1.7.ebuild:
+  Remove pkg_pretend that fails on intial install if pg isn't installed yet
 
 *postgis-2.1.7 (07 Apr 2015)
 
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index fa9bf383fca0..5265f3594630 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -21,7 +21,7 @@ EBUILD postgis-2.1.0.ebuild 7787 SHA256 548680c7d4094b5ee2df37a438315a56f271be95
 EBUILD postgis-2.1.1.ebuild 7947 SHA256 5ab269c893c94b1039ea932174406c4fb21481e1a5d2fdf9d3f3fefc1700a45c SHA512 5fefe867d4266fdcd1710c4f18c61fca0adda500171aff2df89958e2742cac9265798fa293bc8bada57d19ea616a6a94c308b5dee9cedd44b6a45e3436adcf2b WHIRLPOOL 20ba4530f2aee83ef1d0bb2e2e9d4fa26652e991f6de50e109e88109085505c7a5880adde349788933e1b9c87a7490d641e68dd753038259c059632c7da01253
 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
-EBUILD postgis-2.1.7.ebuild 7680 SHA256 ff4a34a105cdd78c9a96f2286a7cec4fef188e94bbe1898ee42e188922f36394 SHA512 e278ee4395baef96eb801aa3b829067b82dbbf55cd1a378211252a94d964d53d4d7e5ec28231eb51547e962c98809477d295ada90083b9072bbbf9e905e97375 WHIRLPOOL fa647f8f06c1e6b9456b373c028155a5301e8db74c5c9de494874c71a69007242141923fae34f64c2f729b537c7f2ff9d3f2f79664c730342dac4a50a2f9b29d
-MISC ChangeLog 14734 SHA256 fef3a0f7701a7ce15348423a12c31b476f137b903b3eb8edca3cfb4192819b5a SHA512 1f3e3ccd68d65eb0e25417fb015fe3457bf6b615dda6ed460c16f060a48847cf365ddd16a344c44d3d337e0a225e0eac9109b4841722f2aae64971a2c8f3abde WHIRLPOOL 13d9a54e0bec2d8be57ff2580597e8d3e3faae0d1093b62b65bcd908909462f9bfc8a0e045c830517770f266022b69bf002b272f1bd76efd11b597cb33b2e481
+EBUILD postgis-2.1.6.ebuild 7598 SHA256 c346e2a69fac41f0e730ef04ce27e1871e8c24fee50d4adff6980832a672c4ba SHA512 b18ae613b63b906d6dbf502bffb28286cec6ec8c7a47bec10f49aff3ec53435337902b8a40d4cd084563013c39089fa5f63d438af2d983f45dc520f98d5665fb WHIRLPOOL 2e32acd4d5b18412994283ec37fb89899ffd2cc0242bd87422f3b955335c27871d1696d46bb6ae507bd5fd6b5a7ea7c564ae3d75a6efe33fa128b9b5e0ea4ec1
+EBUILD postgis-2.1.7.ebuild 7633 SHA256 d54df1e26f22d7f9f48c9ebd6c4a5121f063074bd1c7b6e4357451a0edf98def SHA512 53f05ac2e230ab8e738df2a1a9fd470c01ea434b6642e0118e7a3f3bc85d3c57628ba1e725420e3cae3ab0a746a742cf407b8424ff16a393329cd1c3ee1cb151 WHIRLPOOL c8e8836c5d27c56da4263079d54c78310af5ae2bb25b61a25721233cb8ca4a63772dc102a6a16493968cf26bb6b0d1eef0836989b34cc5e46eaa752f1197b70f
+MISC ChangeLog 14907 SHA256 6d2affdf626bf02461b5a2d9109f812254b9c691a6342de23c3a60422cf4f030 SHA512 134158a01d89ddf56d1bcedbb776a117b2f57affde7dda5f5a5ea4a86aed3044b4430abd64ec44c4ce9e47579eb1c1f94c0c6945a5b0fed7a0a9c5d66d518679 WHIRLPOOL 90e9b196634f0025542ed27992084622de9dca50c7407d91e8063de9855f698d2f5712b9a6d20a0219f4fa4917dfecfdf01bfafd0c021e859acc461e8d7938a3
 MISC metadata.xml 293 SHA256 aba886c4c12c0d9948f277e58a17e155a6d3d7c3424f409a4d4789fb613a5cd3 SHA512 74abb5ec4fae7313859af907a10d68462c185f07923fb4a7aeabcfaea949b6e71647dce38fa6fafcda3e24bbb1f4912fbec2405f5b7bfb4ddf012e59d9e31c01 WHIRLPOOL 9627fa5905b0a0758f64d7d269edbd889f26f6e39a03af6aabdf6b2781d23a581b9b4bc97f06589f997dbc4fa15c83fd149bedc9e12c206904e91af42c1eef84
diff --git a/dev-db/postgis/postgis-2.1.6.ebuild b/dev-db/postgis/postgis-2.1.6.ebuild
index bcb3b380c6d0..c83d9e37f097 100644
--- a/dev-db/postgis/postgis-2.1.6.ebuild
+++ b/dev-db/postgis/postgis-2.1.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.1 2015/03/25 06:02:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.6.ebuild,v 1.2 2015/07/08 06:04:05 patrick Exp $
 
 EAPI="5"
 POSTGRES_COMPAT=( 9.{0,1,2,3,4} )
@@ -84,10 +84,6 @@ postgres_check_slot() {
 	return 0
 }
 
-pkg_pretend() {
-	postgres_check_slot || die
-}
-
 pkg_setup() {
 	postgres_check_slot || die
 	export PGSLOT="$(postgresql-config show)"
diff --git a/dev-db/postgis/postgis-2.1.7.ebuild b/dev-db/postgis/postgis-2.1.7.ebuild
index a2d0091782f3..c7aa26028d1a 100644
--- a/dev-db/postgis/postgis-2.1.7.ebuild
+++ b/dev-db/postgis/postgis-2.1.7.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.7.ebuild,v 1.2 2015/07/08 06:04:05 patrick Exp $
 
 EAPI="5"
 POSTGRES_COMPAT=( 9.{0,1,2,3,4,5} )
@@ -85,10 +85,6 @@ postgres_check_slot() {
 	return 0
 }
 
-pkg_pretend() {
-	postgres_check_slot || die
-}
-
 pkg_setup() {
 	postgres_check_slot || die
 	export PGSLOT="$(postgresql-config show)"