Changed sandbox dependency to block less than 2.0 rather than pull in greater than 2.0. Fixes bug 391965.

Package-Manager: portage-2.1.10.11/cvs/Linux i686

7 files changed, 28 insertions, 21 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index b9cb7ac5334a..bda69bd6f445 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/postgresql-base
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.152 2011/12/17 18:01:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.153 2011/12/27 13:58:25 titanofold Exp $
+
+  27 Dec 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  postgresql-base-8.2.23.ebuild, postgresql-base-8.3.17.ebuild,
+  postgresql-base-8.4.10.ebuild, postgresql-base-9.0.6.ebuild,
+  postgresql-base-9.1.2.ebuild:
+  Changed sandbox dependency to block less than 2.0 rather than pull in greater
+  than 2.0. Fixes bug 391965.
 
   17 Dec 2011; Raúl Porcel <armin76@gentoo.org> postgresql-base-9.1.1.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #388489
diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index c8b211d884fc..f1581d8c2bbe 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST postgresql-8.2.22.tar.bz2 12777172 RMD160 27e31b4a423984080a87cb6dc86ca8773362a131 SHA1 7b5f56b5d3a1e2e9cee6e7a4f0f04866af45cc7d SHA256 88203528326c152ca556bcff986d824737ea1048ba2c6245e24a1b1efd6aeaf7
 DIST postgresql-8.2.23.tar.bz2 12976249 RMD160 5a1d45cae1e7a9d9caa8e902608404b281bac7ff SHA1 f51ac2051c4b1c95f5f58bf75bbafc50d2bc359b SHA256 56c2ac7394e8ace9ef98a464d08530b91529fd56978f24b55139d20e3039f2d1
@@ -22,21 +22,21 @@ DIST postgresql-patches-9.0-r3.tbz2 4503 RMD160 05d4167c3a48a432ab79cb57fee5e466
 DIST postgresql-patches-9.1-r1.tbz2 4547 RMD160 2cdd98c1f6075a68ef294ceefc94e46ff1583919 SHA1 0ed2fd26ba51fe945b573accec5970b8cee5eb4c SHA256 50cefff4a6f6e1fd38b99dde4793dc5f153b9691ff5c59fbb2b97864f1f7d727
 DIST postgresql-patches-9.1.tbz2 4563 RMD160 1516ee0d26fffe5e275428d08ba926bad9b45407 SHA1 5ff25d423386b476c60bbccfda93b82bfc5e5cc9 SHA256 be0dc8be6029443c9de31b61002c128447d53f8fb4b05e89b86d900ced647c16
 EBUILD postgresql-base-8.2.22.ebuild 3746 RMD160 2557e3bcff305cbd2618c7ca3594673f78e108bb SHA1 99d7d9bd2e4dbb7fc2766788e3f415eeded3814e SHA256 b06f2f4347f3d74e033ae8317f7f30e6910ce971f8747066f94a2c9eadcc959b
-EBUILD postgresql-base-8.2.23.ebuild 3953 RMD160 cff9473d984e697e7311b0e75b6ace882a5b08c8 SHA1 53a9487cf38aa47c0028e4e88d3b72ceda2ba81c SHA256 9fb99177548976afb53575cd165954535f8fd4214d3e740f1a7b426805a8533e
+EBUILD postgresql-base-8.2.23.ebuild 3954 RMD160 74ccd6dcd911dc482373f3bd86aeffd4e4656d13 SHA1 d5a4208d58b5ab5c3c2a9e94dd50990085198397 SHA256 376f4abc561e67ecc38d672cc35d16a1807ca32e0e81136f646a294a0c9cc121
 EBUILD postgresql-base-8.3.16.ebuild 3861 RMD160 3ca643363231bdf9406def3f69e057396d86188d SHA1 98ec2618b8368562aff15637d7e52b425832a428 SHA256 3c94fbcacc72b79f89f3b5b0918079d67e026c8631ffc71680bda9dc97103227
-EBUILD postgresql-base-8.3.17.ebuild 4057 RMD160 9be2e887b92c151f172e5e5d5e5d45931768b371 SHA1 3c02e0889b1916b77f0d82f9be807ed5911eb636 SHA256 7059c7a064ae55cfafd1f575d4979f06663ddcfe6e202edb77fefeb93ae09ec0
-EBUILD postgresql-base-8.4.10.ebuild 4059 RMD160 12a296542257624acacef637058e7fa68d0c8778 SHA1 bc991af67358d6f4de48e69220b584b07a2bc1e5 SHA256 4285cb88eceddeb911a694a5be781e54d087db782ad228d72637e90783d8452b
+EBUILD postgresql-base-8.3.17.ebuild 4058 RMD160 2b3cf7456c83663812c4086b0963fc5ae9180da6 SHA1 7eabe9961a621bf13c2ef62725eb58d380c80ae0 SHA256 73d456e2d899bc0ef1d8e885b36a66f560ab599a722b3e2fe654fdf6875d5866
+EBUILD postgresql-base-8.4.10.ebuild 4060 RMD160 fdb509413e48a674e2ecfdc8cf39b869098ec1f4 SHA1 ed5af4a91e2cd77d719fbe760c2ae21ffa5c3b5e SHA256 b722b7eb0708441221e55497a771fccc07390d7f101c1514a26d855ba2255ee3
 EBUILD postgresql-base-8.4.9.ebuild 3862 RMD160 56ff8e8771fa018a8e635e22670757977a838900 SHA1 74ee39fb1ce9f78ed9c9a6add6a617cd00dbab11 SHA256 661153ec2e72f0a5e6a4ea589c4838596c01cbb9890e74ece898a9ad8b2aa5d0
 EBUILD postgresql-base-9.0.5.ebuild 4016 RMD160 8a129227c2c840a9eb66e79758c07cfa01e30baf SHA1 21d38671a5aea9796d6d215de7d5d86bac6e44b2 SHA256 2228ab7df1e93691507517bf4c5ef10c717233f61df3884bb2b9d494491c7ad1
-EBUILD postgresql-base-9.0.6.ebuild 4212 RMD160 1587b104a1194216f1193432b968107be1b9759b SHA1 7a4bfeba820f9cbdc5612b82ac560114b0d8d32b SHA256 8c04daba1a3d7cb1323c383354f5f2c8072aaf75755dec6e2e18138589e2ec39
+EBUILD postgresql-base-9.0.6.ebuild 4213 RMD160 ed72a98e92990a18fd373d8eefd39b6f4717c888 SHA1 3b4bea40daa4b90f9be27ac613f9a4f0ec32481c SHA256 04105b58aa4e0f7e20482e326135d2d92eef41de6aa151cb8d31a77cf0c44446
 EBUILD postgresql-base-9.1.1.ebuild 4011 RMD160 36b525faac362eb5fdeb49e91ee0a75f3aa49a7d SHA1 8f8afb9036fbabeb30958d474fbbee34f684a905 SHA256 9e9f0b590d5db7e92077e563000610bcc4e207bf0c55ea48adb30cddc818d08f
-EBUILD postgresql-base-9.1.2.ebuild 4213 RMD160 67d9dfbcdece40f133a9eb7f31bfb81b5626bbaa SHA1 dbb1107a9e030095d976d606e568b536b10d14cb SHA256 abab11c1524b50bab395e59eb3a3aff51ef98192d93c98d0e03d365bf568c263
-MISC ChangeLog 42785 RMD160 f5f5619f1281f4a212840a34362f657bf2acbf01 SHA1 2f53a43d5cd5cc2811ebcdca4282e5160aa59289 SHA256 bbb98a84798247be431c6c26f848f0c1102647b49eef7f71632529ff18b3d797
+EBUILD postgresql-base-9.1.2.ebuild 4214 RMD160 70bc9ebfe7be1ef1d62cbda74c580efcf6bc1804 SHA1 538a89f44990a4180d00474bea522c541d551453 SHA256 84d5615c9af4807959375f911b7a1b68639ef1cd4273aa0ac434cf1e0864ce3d
+MISC ChangeLog 43114 RMD160 c3152fb694bdf97b3753078b55f9f6a2249e86b5 SHA1 f92c84d14ffdadaa9befa9381b0bac64ec2ed50b SHA256 e9b6ed230d7ea809b1de553a133e74d187dc099e268e896366cdbc305bb371b7
 MISC metadata.xml 472 RMD160 fe3dc42a49cd1445788d023578d878c6226c72e0 SHA1 f03eda301fc89bf31cfb64bb6cc2cc4ca33cb632 SHA256 ee20753f4083988318c4c30155901e99a800dc8fb19fd77c80f9947c72abbf4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7s2QEACgkQuQc30/atMkCH9ACfREQtBkG9rvrhG/EHuc8f0VUY
-8FMAoJz33iMmdqiynVr6Sfv8l9KcipeY
-=A+N/
+iF4EAREIAAYFAk75zwkACgkQVxOqA9G7/aCJvgEAjzOBZD7DqpJ8O4dg43ZljXMF
+4OgPZmKQ3HcfAhGIao0A/0HLCT/IHR0iB01o5N3fmgrqMI/3FxB65S1RMusVmLoK
+=Y0aT
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgresql-base/postgresql-base-8.2.23.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.23.ebuild
index b9fc8aa51208..d477b526d7fa 100644
--- a/dev-db/postgresql-base/postgresql-base-8.2.23.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.2.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.2.23.ebuild,v 1.1 2011/12/08 02:08:33 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.2.23.ebuild,v 1.2 2011/12/27 13:58:25 titanofold Exp $
 
 EAPI="4"
 
@@ -54,7 +54,7 @@ RDEPEND=">=app-admin/eselect-postgresql-1.0.10
 		 zlib? ( >=sys-libs/zlib-1.1.3 )"
 
 DEPEND="${RDEPEND}
-		>=sys-apps/sandbox-2.0
+		!!<sys-apps/sandbox-2.0
 		>=sys-devel/bison-1.875
 		sys-devel/flex
 		nls? ( sys-devel/gettext )"
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.17.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.17.ebuild
index 5583bf150e2c..0924a9096145 100644
--- a/dev-db/postgresql-base/postgresql-base-8.3.17.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.3.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.3.17.ebuild,v 1.1 2011/12/08 02:08:33 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.3.17.ebuild,v 1.2 2011/12/27 13:58:25 titanofold Exp $
 
 EAPI="4"
 
@@ -54,7 +54,7 @@ RDEPEND=">=app-admin/eselect-postgresql-1.0.10
 		 zlib? ( >=sys-libs/zlib-1.1.3 )"
 
 DEPEND="${RDEPEND}
-		>=sys-apps/sandbox-2.0
+		!!<sys-apps/sandbox-2.0
 		>=sys-devel/bison-1.875
 		sys-devel/flex
 		nls? ( sys-devel/gettext )"
diff --git a/dev-db/postgresql-base/postgresql-base-8.4.10.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.10.ebuild
index f4d66161e825..b6da364b8860 100644
--- a/dev-db/postgresql-base/postgresql-base-8.4.10.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.4.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.4.10.ebuild,v 1.1 2011/12/08 02:08:33 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.4.10.ebuild,v 1.2 2011/12/27 13:58:25 titanofold Exp $
 
 EAPI="4"
 
@@ -54,7 +54,7 @@ RDEPEND=">=app-admin/eselect-postgresql-1.0.7
 		 zlib? ( >=sys-libs/zlib-1.1.3 )"
 
 DEPEND="${RDEPEND}
-		>=sys-apps/sandbox-2.0
+		!!<sys-apps/sandbox-2.0
 		>=sys-devel/bison-1.875
 		sys-devel/flex
 		nls? ( sys-devel/gettext )"
diff --git a/dev-db/postgresql-base/postgresql-base-9.0.6.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.6.ebuild
index c5b0a63ac739..7628646dff7c 100644
--- a/dev-db/postgresql-base/postgresql-base-9.0.6.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-9.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.6.ebuild,v 1.1 2011/12/08 02:08:33 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.6.ebuild,v 1.2 2011/12/27 13:58:25 titanofold Exp $
 
 EAPI="4"
 
@@ -56,7 +56,7 @@ RDEPEND=">=app-admin/eselect-postgresql-1.0.7
 DEPEND="${RDEPEND}
 		sys-devel/bison
 		sys-devel/flex
-		>=sys-apps/sandbox-2.0
+		!!<sys-apps/sandbox-2.0
 		nls? ( sys-devel/gettext )"
 
 PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
diff --git a/dev-db/postgresql-base/postgresql-base-9.1.2.ebuild b/dev-db/postgresql-base/postgresql-base-9.1.2.ebuild
index 4d19b34d355f..11f752f4dcdf 100644
--- a/dev-db/postgresql-base/postgresql-base-9.1.2.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-9.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.1.2.ebuild,v 1.1 2011/12/08 02:08:33 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.1.2.ebuild,v 1.2 2011/12/27 13:58:25 titanofold Exp $
 
 EAPI="4"
 
@@ -54,7 +54,7 @@ RDEPEND="!!dev-db/libpq
 "
 
 DEPEND="${RDEPEND}
-		>=sys-apps/sandbox-2.0
+		!!<sys-apps/sandbox-2.0
 		sys-devel/bison
 		sys-devel/flex
 		nls? ( sys-devel/gettext )