Upgrade to PostgreSQL 9.1 and slony1 2.1 rc2

5 files changed, 8 insertions, 20 deletions

diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index ec39167..f51fd0c 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -3,9 +3,9 @@ AUX slony1.init 727 RMD160 bb42edd46c021da2c06ab87e956dd7fd45b074d7 SHA1 b7d34ba
 AUX slony1.logrotate 143 RMD160 69be266c37aee891112dfe0cc7d7231f0db41101 SHA1 d231d63b69319269a3b5cc9839e741bffb5d89d6 SHA256 05d08a06816c65d300ddfdd461052e106aa8a37a14f32fb89a2b8a53ca5878c1
 DIST slony1-2.0.5.tar.bz2 965640 RMD160 7235658277ab8a7ed0ee722d52f33e766534f18b SHA1 cc285c8d5659d2389caef281829f6110fe74a392 SHA256 4f382447a399966caf0dec94da208d6435fdc4d6341784f0e32468efa5f4a369
 DIST slony1-2.0.6.tar.bz2 979208 RMD160 39ceec9fc823903e6e2c6080558ab5e00a476697 SHA1 6e3c8d9bb8ae138c089782836f9b303cadc82b97 SHA256 7630ce45c3ff64d032de0a519a0992fadee8887ce0a728c13a2fbe23371f324f
-DIST slony1-2.1.0.b1.tar.bz2 1006042 RMD160 c492e7a04cc34cdf93e4c44db147c12e86ac577e SHA1 1b9b05035f3396d3d1e7140de0d58e798038b1fd SHA256 304ab3322353ef7ddfe73ec10e28aa60f9d86ac815b0b50fedd4c26c44cdca4e
+DIST slony1-2.1.0.rc2.tar.bz2 1484338 RMD160 ac25ce535c60a617c1382ed24b72cc932262f630 SHA1 e81563da38642236c92b88148abd886ab198017e SHA256 3113d75505794e0266ea1359645b4f9914a5d91827df793dcdecd49325f20b4f
 EBUILD slony1-2.0.5-r1.ebuild 1336 RMD160 fce4f9760edf29d4f492005d516bbaf084334deb SHA1 3da045eb172fdcc9202d371bff5f901c1fcca77d SHA256 6985f9088f95b7369c47c3dfef306416096bbb3c3ef21e0ed9cf96fb527db959
 EBUILD slony1-2.0.6.ebuild 1320 RMD160 9d8bb9115a5a0f2ebd788d4d276808a68d17e634 SHA1 fc095d184cc7e9d56a6aaf2b0edeb98584f56266 SHA256 9fff18bc3a988dcf0a4d0d0c87ecfd40f1f50665a52980e0346b8f6b1a4cbd85
-EBUILD slony1-2.1.0_beta1.ebuild 1383 RMD160 16800fe2b2534b4a98a3707de4f55e9327f503a1 SHA1 89020ebb6f0ee2afa29285f1a6f9e38f39b8c698 SHA256 d347a1909b7fb9eb4531f696a73c4f6e3b482253743b0838e0fa9c453eeb82e5
+EBUILD slony1-2.1.0_rc2.ebuild 1385 RMD160 eeb7da92d5bd44dde7766eb9d7e6debe50c2633d SHA1 e3536750492ab59a4ab66cdc68ed63aba24a4030 SHA256 e008e3787f9db823cb74cc4eb7f81a962c3bcbf9c86cb58ee00e3d0b6ec0c9b5
 MISC ChangeLog 3229 RMD160 d8e9fb27fa544f23f6ca63dccf7cbf761a0e285e SHA1 d70f1d5d013bb75671ade34ae2ed8b37c63d22ea SHA256 a6e91a7f952e8b85c80dfebe8fc11bc6b1d5f900ea8322e0ab1859b4a822e18e
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/dev-db/slony1/slony1-2.1.0_beta1.ebuild b/dev-db/slony1/slony1-2.1.0_rc2.ebuild
index ed13e1f..4152a04 100644
--- a/dev-db/slony1/slony1-2.1.0_beta1.ebuild
+++ b/dev-db/slony1/slony1-2.1.0_rc2.ebuild
@@ -8,7 +8,7 @@ IUSE="perl"
 
 DESCRIPTION="A replication system for the PostgreSQL Database Management System"
 HOMEPAGE="http://slony.info/"
-SRC_URI="http://main.slony.info/downloads/2.1/source/slony1-2.1.0.b1.tar.bz2"
+SRC_URI="http://main.slony.info/downloads/2.1/source/slony1-2.1.0.rc2.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="dev-db/postgresql-server
 	perl? ( dev-perl/DBD-Pg )"
-S="${WORKDIR}/slony1-2.1.0.b1"
+S="${WORKDIR}/slony1-2.1.0.rc2"
 
 src_compile() {
 	local myconf=""
diff --git a/virtual/miller-postgresql/Manifest b/virtual/miller-postgresql/Manifest
index 4cc8a6d..ba5b923 100644
--- a/virtual/miller-postgresql/Manifest
+++ b/virtual/miller-postgresql/Manifest
@@ -1,2 +1 @@
-EBUILD miller-postgresql-3.ebuild 253 RMD160 f87229d1a15740f26cb7c6f2d2b9e89fd0424248 SHA1 23877263f7824079fb7dbd111f547884d3269619 SHA256 278ce22767df96d9d29a4eeef1a661c9915eb20ffc88bbf2f020951994867e86
-EBUILD miller-postgresql-4.ebuild 233 RMD160 34b7a5fc469c38dd59ebbc1a296c3778314f4b8b SHA1 a6b73ec85c15ec71c8c846ed36862cd8294cda36 SHA256 0950a5359a26eae51bf5d0de3e12eedec473df9a747ce20c38701df3e2c93e43
+EBUILD miller-postgresql-4.ebuild 248 RMD160 5782845d418bbdd8edd0d3b5a5f734772628fe27 SHA1 b1f20998f6d9d023177a7275256c6b5c77f46eae SHA256 08cd9e58f90ae3ceb0cfbc8d3601d8b670db4778bea48846b903e7f617b2452a
diff --git a/virtual/miller-postgresql/miller-postgresql-3.ebuild b/virtual/miller-postgresql/miller-postgresql-3.ebuild
deleted file mode 100644
index b277a24..0000000
--- a/virtual/miller-postgresql/miller-postgresql-3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION="Virtual for Miller PostgreSQL servers"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE=""
-
-DEPEND="
-virtual/miller-base
->=dev-db/apgdiff-1.2
-=dev-db/postgresql-server-8.4*
->=dev-db/slony1-2"
-
diff --git a/virtual/miller-postgresql/miller-postgresql-4.ebuild b/virtual/miller-postgresql/miller-postgresql-4.ebuild
index 3238255..43370d2 100644
--- a/virtual/miller-postgresql/miller-postgresql-4.ebuild
+++ b/virtual/miller-postgresql/miller-postgresql-4.ebuild
@@ -3,10 +3,11 @@ DESCRIPTION="Virtual for Miller PostgreSQL servers"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE=""
+EAPI="2"
 
 DEPEND="
 virtual/miller-base
-=dev-db/postgresql-server-9.0*
->=dev-db/slony1-2
+=dev-db/postgresql-server-9.1*
+>=dev-db/slony1-2[perl]
 "