Changing virtual order and dropping old pgsql for 8.3 and 8.4 to unconfuse package managers. Thanks to grobian for noticing.

Package-Manager: portage-2.2_rc45/cvs/Linux x86_64

15 files changed, 51 insertions, 36 deletions

diff --git a/virtual/postgresql-base/ChangeLog b/virtual/postgresql-base/ChangeLog
index ec8be78887d1..b2a2d3622c9a 100644
--- a/virtual/postgresql-base/ChangeLog
+++ b/virtual/postgresql-base/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for virtual/postgresql-base
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/ChangeLog,v 1.13 2009/10/01 20:56:41 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/ChangeLog,v 1.14 2009/10/11 09:00:42 patrick Exp $
+
+  11 Oct 2009; Patrick Lauer <patrick@gentoo.org>
+  postgresql-base-7.4.ebuild, postgresql-base-8.0.ebuild,
+  postgresql-base-8.1.ebuild, postgresql-base-8.2.ebuild,
+  postgresql-base-8.3.ebuild, postgresql-base-8.4.ebuild:
+  Changing virtual order and dropping old pgsql for 8.3 and 8.4 to unconfuse
+  package managers. Thanks to grobian for noticing.
 
   01 Oct 2009; Tobias Klausmann <klausman@gentoo.org>
   postgresql-base-8.4.ebuild:
diff --git a/virtual/postgresql-base/postgresql-base-7.4.ebuild b/virtual/postgresql-base/postgresql-base-7.4.ebuild
index 190b85d334f2..022ddbe5a0b4 100644
--- a/virtual/postgresql-base/postgresql-base-7.4.ebuild
+++ b/virtual/postgresql-base/postgresql-base-7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-7.4.ebuild,v 1.2 2008/05/19 07:15:47 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-7.4.ebuild,v 1.3 2009/10/11 09:00:42 patrick Exp $
 
 EAPI="1"
 
@@ -13,4 +13,4 @@ SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-RDEPEND="|| ( =dev-db/libpq-${PV}* dev-db/postgresql-base:${SLOT} )"
+RDEPEND="|| ( dev-db/postgresql-base:${SLOT} =dev-db/libpq-${PV}* )"
diff --git a/virtual/postgresql-base/postgresql-base-8.0.ebuild b/virtual/postgresql-base/postgresql-base-8.0.ebuild
index 3def68ae504d..10fe28db121a 100644
--- a/virtual/postgresql-base/postgresql-base-8.0.ebuild
+++ b/virtual/postgresql-base/postgresql-base-8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-8.0.ebuild,v 1.2 2008/05/19 07:15:47 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-8.0.ebuild,v 1.3 2009/10/11 09:00:42 patrick Exp $
 
 EAPI="1"
 
@@ -13,4 +13,4 @@ SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-RDEPEND="|| ( =dev-db/libpq-${PV}* dev-db/postgresql-base:${SLOT} )"
+RDEPEND="|| ( dev-db/postgresql-base:${SLOT} =dev-db/libpq-${PV}* )"
diff --git a/virtual/postgresql-base/postgresql-base-8.1.ebuild b/virtual/postgresql-base/postgresql-base-8.1.ebuild
index 71ed27fd2a39..b228ba2626a2 100644
--- a/virtual/postgresql-base/postgresql-base-8.1.ebuild
+++ b/virtual/postgresql-base/postgresql-base-8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-8.1.ebuild,v 1.7 2009/09/07 13:47:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-8.1.ebuild,v 1.8 2009/10/11 09:00:42 patrick Exp $
 
 EAPI="1"
 
@@ -13,4 +13,4 @@ SLOT="${PV}"
 KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| ( =dev-db/libpq-${PV}* dev-db/postgresql-base:${SLOT} )"
+RDEPEND="|| ( dev-db/postgresql-base:${SLOT} =dev-db/libpq-${PV}* )"
diff --git a/virtual/postgresql-base/postgresql-base-8.2.ebuild b/virtual/postgresql-base/postgresql-base-8.2.ebuild
index b856226a15d7..785177fec61c 100644
--- a/virtual/postgresql-base/postgresql-base-8.2.ebuild
+++ b/virtual/postgresql-base/postgresql-base-8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-8.2.ebuild,v 1.1 2008/04/15 09:41:07 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-8.2.ebuild,v 1.2 2009/10/11 09:00:42 patrick Exp $
 
 EAPI="1"
 
@@ -13,4 +13,4 @@ SLOT="${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| ( =dev-db/libpq-${PV}* dev-db/postgresql-base:${SLOT} )"
+RDEPEND="|| ( dev-db/postgresql-base:${SLOT} =dev-db/libpq-${PV}* )"
diff --git a/virtual/postgresql-base/postgresql-base-8.3.ebuild b/virtual/postgresql-base/postgresql-base-8.3.ebuild
index ef30da235657..c598f9936b4e 100644
--- a/virtual/postgresql-base/postgresql-base-8.3.ebuild
+++ b/virtual/postgresql-base/postgresql-base-8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-8.3.ebuild,v 1.3 2009/05/03 11:55:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-8.3.ebuild,v 1.4 2009/10/11 09:00:42 patrick Exp $
 
 EAPI="1"
 
@@ -13,4 +13,4 @@ SLOT="${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| ( =dev-db/libpq-${PV}* dev-db/postgresql-base:${SLOT} )"
+RDEPEND="dev-db/postgresql-base:${SLOT}"
diff --git a/virtual/postgresql-base/postgresql-base-8.4.ebuild b/virtual/postgresql-base/postgresql-base-8.4.ebuild
index 9cf5cf23fe29..d853fc74439c 100644
--- a/virtual/postgresql-base/postgresql-base-8.4.ebuild
+++ b/virtual/postgresql-base/postgresql-base-8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-8.4.ebuild,v 1.3 2009/10/01 20:56:41 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-8.4.ebuild,v 1.4 2009/10/11 09:00:42 patrick Exp $
 
 EAPI="1"
 
@@ -13,4 +13,4 @@ SLOT="${PV}"
 KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| ( =dev-db/libpq-${PV}* dev-db/postgresql-base:${SLOT} )"
+RDEPEND="dev-db/postgresql-base:${SLOT}"
diff --git a/virtual/postgresql-server/ChangeLog b/virtual/postgresql-server/ChangeLog
index b55ce72335db..ede3dfe5cddf 100644
--- a/virtual/postgresql-server/ChangeLog
+++ b/virtual/postgresql-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for virtual/postgresql-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/ChangeLog,v 1.8 2009/09/09 21:42:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/ChangeLog,v 1.9 2009/10/11 09:01:08 patrick Exp $
+
+  11 Oct 2009; Patrick Lauer <patrick@gentoo.org>
+  postgresql-server-7.3.ebuild, postgresql-server-7.4.ebuild,
+  postgresql-server-8.0.ebuild, postgresql-server-8.1.ebuild,
+  postgresql-server-8.2.ebuild, postgresql-server-8.3.ebuild,
+  postgresql-server-8.4.ebuild:
+  Changing virtual order and dropping old pgsql for 8.3 and 8.4 to unconfuse
+  package managers. Thanks to grobian for noticing.
 
 *postgresql-server-8.4 (09 Sep 2009)
 
diff --git a/virtual/postgresql-server/postgresql-server-7.3.ebuild b/virtual/postgresql-server/postgresql-server-7.3.ebuild
index 1d92fb3f0e0b..05a94352f6ea 100644
--- a/virtual/postgresql-server/postgresql-server-7.3.ebuild
+++ b/virtual/postgresql-server/postgresql-server-7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-7.3.ebuild,v 1.3 2008/05/19 07:17:40 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-7.3.ebuild,v 1.4 2009/10/11 09:01:08 patrick Exp $
 
 EAPI="1"
 
@@ -13,4 +13,4 @@ SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-RDEPEND="|| ( =dev-db/postgresql-${PV}* dev-db/postgresql-server:${SLOT} )"
+RDEPEND="|| ( dev-db/postgresql-server:${SLOT} =dev-db/postgresql-${PV}* )"
diff --git a/virtual/postgresql-server/postgresql-server-7.4.ebuild b/virtual/postgresql-server/postgresql-server-7.4.ebuild
index 96f25fcc73ec..b05a56f45b42 100644
--- a/virtual/postgresql-server/postgresql-server-7.4.ebuild
+++ b/virtual/postgresql-server/postgresql-server-7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-7.4.ebuild,v 1.3 2008/05/19 07:17:40 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-7.4.ebuild,v 1.4 2009/10/11 09:01:08 patrick Exp $
 
 EAPI="1"
 
@@ -13,4 +13,4 @@ SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-RDEPEND="|| ( =dev-db/postgresql-${PV}* dev-db/postgresql-server:${SLOT} )"
+RDEPEND="|| ( dev-db/postgresql-server:${SLOT} =dev-db/postgresql-${PV}* )"
diff --git a/virtual/postgresql-server/postgresql-server-8.0.ebuild b/virtual/postgresql-server/postgresql-server-8.0.ebuild
index 82dd4fa0de28..2662bbcd1eee 100644
--- a/virtual/postgresql-server/postgresql-server-8.0.ebuild
+++ b/virtual/postgresql-server/postgresql-server-8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-8.0.ebuild,v 1.3 2008/05/19 07:17:40 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-8.0.ebuild,v 1.4 2009/10/11 09:01:08 patrick Exp $
 
 EAPI="1"
 
@@ -13,4 +13,4 @@ SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-RDEPEND="|| ( =dev-db/postgresql-${PV}* dev-db/postgresql-server:${SLOT} )"
+RDEPEND="|| ( dev-db/postgresql-server:${SLOT} =dev-db/postgresql-${PV}* )"
diff --git a/virtual/postgresql-server/postgresql-server-8.1.ebuild b/virtual/postgresql-server/postgresql-server-8.1.ebuild
index b6fc612575c6..449f540b4c19 100644
--- a/virtual/postgresql-server/postgresql-server-8.1.ebuild
+++ b/virtual/postgresql-server/postgresql-server-8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-8.1.ebuild,v 1.4 2009/08/02 13:51:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-8.1.ebuild,v 1.5 2009/10/11 09:01:08 patrick Exp $
 
 EAPI="1"
 
@@ -13,4 +13,4 @@ SLOT="${PV}"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| ( =dev-db/postgresql-${PV}* dev-db/postgresql-server:${SLOT} )"
+RDEPEND="|| ( dev-db/postgresql-server:${SLOT} =dev-db/postgresql-${PV}* )"
diff --git a/virtual/postgresql-server/postgresql-server-8.2.ebuild b/virtual/postgresql-server/postgresql-server-8.2.ebuild
index 29ab335bab72..50f7a614c437 100644
--- a/virtual/postgresql-server/postgresql-server-8.2.ebuild
+++ b/virtual/postgresql-server/postgresql-server-8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-8.2.ebuild,v 1.2 2008/04/15 09:43:09 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-8.2.ebuild,v 1.3 2009/10/11 09:01:08 patrick Exp $
 
 EAPI="1"
 
@@ -13,4 +13,4 @@ SLOT="${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| ( =dev-db/postgresql-${PV}* dev-db/postgresql-server:${SLOT} )"
+RDEPEND="|| ( dev-db/postgresql-server:${SLOT} =dev-db/postgresql-${PV}* )"
diff --git a/virtual/postgresql-server/postgresql-server-8.3.ebuild b/virtual/postgresql-server/postgresql-server-8.3.ebuild
index 2e72a33313b6..3a9e041528ff 100644
--- a/virtual/postgresql-server/postgresql-server-8.3.ebuild
+++ b/virtual/postgresql-server/postgresql-server-8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-8.3.ebuild,v 1.2 2008/05/19 07:13:12 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-8.3.ebuild,v 1.3 2009/10/11 09:01:08 patrick Exp $
 
 EAPI="1"
 
@@ -13,4 +13,4 @@ SLOT="${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| ( =dev-db/postgresql-${PV}* dev-db/postgresql-server:${SLOT} )"
+RDEPEND="dev-db/postgresql-server:${SLOT}"
diff --git a/virtual/postgresql-server/postgresql-server-8.4.ebuild b/virtual/postgresql-server/postgresql-server-8.4.ebuild
index dea0753627fe..adc363d4fad8 100644
--- a/virtual/postgresql-server/postgresql-server-8.4.ebuild
+++ b/virtual/postgresql-server/postgresql-server-8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-8.4.ebuild,v 1.1 2009/09/09 21:42:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-8.4.ebuild,v 1.2 2009/10/11 09:01:08 patrick Exp $
 
 EAPI="1"
 
@@ -13,4 +13,4 @@ SLOT="${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| ( =dev-db/postgresql-${PV}* dev-db/postgresql-server:${SLOT} )"
+RDEPEND="dev-db/postgresql-server:${SLOT}"