fixed version check logic. (#112400)

Package-Manager: portage-1.589-cvs

3 files changed, 72 insertions, 79 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 58fb94afd9b8..fb3f298717f2 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.251 2005/11/21 18:45:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.252 2005/11/23 04:12:06 nakano Exp $
+
+  23 Nov 2005; Masatomo Nakano <nakano@gentoo.org> postgresql-8.1.0.ebuild:
+  Fixed version check logic for 8.1. (#72814)
 
   21 Nov 2005; Joseph Jezak <josejx@gentoo.org> postgresql-7.3.11.ebuild,
   postgresql-7.4.9.ebuild, postgresql-8.0.4.ebuild:
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 9c22a0a006a1..0908963b6aa0 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,95 +1,85 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7ca1d1081cdfd4813a05dd4ccfae03db ChangeLog 48004
-MD5 8ca6301197c0d45d7530d4117d087b15 files/CAN-2005-1409-doc.patch 1749
+MD5 b0b94d20c7d268d602aa6c60e0ce5ce9 postgresql-8.0.1-r3.ebuild 7735
+MD5 6b7a297c80d292c075eca122933d25aa postgresql-8.1.0.ebuild 7622
+MD5 f468afa31445f55ae2a035dba1e0911f postgresql-7.4.9.ebuild 10739
+MD5 993f8413e91946fb334582c36b39afcb postgresql-7.4.7-r1.ebuild 10701
+MD5 139b7ac3104b67db427da2074f54941b postgresql-8.0.4.ebuild 7681
+MD5 68b207bf92c9fb56d7911c0b5af6cc9b postgresql-7.3.10.ebuild 8138
+MD5 2265cba6143f2d8471e41be421367c5b postgresql-7.3.9-r1.ebuild 8028
+MD5 e04819f89769e06c3ff5d0019ea1f46c postgresql-7.4.8.ebuild 10569
+MD5 0ab1b6f2bce8c619c7824a648f44667b postgresql-8.0.3.ebuild 7510
+MD5 99f4b845820fa12720b8eecec8085c56 postgresql-8.0.1-r4.ebuild 7824
+MD5 08e125da5fd9e78854a2eb23f78274c3 postgresql-7.4.7-r2.ebuild 10854
+MD5 c25c9a7ffe3a89d13b05d6030f4d9889 postgresql-7.3.6-r2.ebuild 7837
+MD5 85263402663eb1a9ad38abae1fa9e693 ChangeLog 48127
+MD5 df1ce9230106e5853fb50850305ca2ba postgresql-7.3.11.ebuild 8305
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 90acacf5efb7b8a73ec5d34128358c32 files/CAN-2005-1409.patch 1698
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918
+MD5 df4fedbfa30df690a6f78da9f5a44196 files/postgresql-7.4.7-securityfix.patch 1773
+MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.0.4-sh.patch 618
+MD5 3273c43da88db8e7fa5fd9c413f651c5 files/postgresql.init-7.3.10 1280
+MD5 4165a3ef6d3e253340b56c719a866c87 files/postgresql.init-7.3.11 1280
+MD5 8ca6301197c0d45d7530d4117d087b15 files/CAN-2005-1409-doc.patch 1749
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.8-vacuum-delay.patch 8918
+MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.1.0-sh.patch 618
+MD5 61b463e796709e035216374cb149d614 files/postgresql-7.3.10-gentoo.patch 1741
+MD5 01f69b667825048f2e9807555b79b73d files/postgresql-8.0.3-gentoo.patch 1200
+MD5 64cac596c308b19865f5738cc5af02b1 files/postgresql-7.4.9-gentoo.patch 1729
 MD5 3c53278e59e16caa55429700c0da42f9 files/CAN-2005-1410.patch 2843
-MD5 314c9147f25d4676c60a4761bbe500e2 files/digest-postgresql-7.3.10 226
-MD5 419268f051162aee7f36e9c0b384fcc1 files/digest-postgresql-7.3.11 226
-MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r2 223
-MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9-r1 223
-MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r1 290
-MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r2 290
-MD5 4d7967107d2e9dbb6c097c637625023b files/digest-postgresql-7.4.8 290
-MD5 b368c73c1f3a16e6aacf7f83feba9873 files/digest-postgresql-7.4.9 290
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.9-vacuum-delay.patch 8918
 MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r3 293
 MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r4 293
+MD5 6237c18ae647e118e23425e3cb28c8aa files/postgresql.init-7.3.6 1279
+MD5 5d90779b8c5b7d63ea0846f2a534fc87 files/postgresql.init-7.3.9 1279
+MD5 8b2a2b4c8f40a1fdbe73d7a6fbcfb6fe files/postgresql.init-7.4.7 1279
+MD5 eae31db55e9908de6d955d3efc931bbc files/postgresql.init-7.4.8 1279
+MD5 37e9be11579a5dd887ea56898555a013 files/postgresql.init-7.4.9 1279
+MD5 fe44693b90eef9cf0b6118edb258da16 files/postgresql.init-8.0.1 1279
+MD5 b7252dad787e4e9f4d645a47d7f74ad8 files/postgresql.init-8.0.3 1279
+MD5 11eb946998d42bb657f9408b804b3099 files/postgresql.init-8.0.4 1279
+MD5 d41a81e2e89a457cd171237bab44c8a0 files/postgresql.init-8.1.0 1279
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.7 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.8 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.9 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.1 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.3 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.4 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.1.0 390
+MD5 4591d7bc6524b885854c18bb9b9ce23a files/postgresql-8.0.1-securityfix.patch 1850
+MD5 4d7967107d2e9dbb6c097c637625023b files/digest-postgresql-7.4.8 290
+MD5 b368c73c1f3a16e6aacf7f83feba9873 files/digest-postgresql-7.4.9 290
 MD5 6eaf9ba52385d9fc515d84cc4246db62 files/digest-postgresql-8.0.3 293
 MD5 6b8a3129c9f85d8e97c5ee384c4c489b files/digest-postgresql-8.0.4 293
 MD5 8a85abe5618194b2492c6ea1064cdffa files/digest-postgresql-8.1.0 223
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.7 302
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.8 302
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.9 302
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.1 302
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.3 302
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.4 302
 MD5 ffe7e2e6a0ae65238f2addcbbbba59d0 files/pg_autovacuum.init-7.4.7 1414
 MD5 50be58ef7b752834f53ae86c70f75d9a files/pg_autovacuum.init-7.4.8 1414
 MD5 b35f19cbbb6d2ef9cdc62a3a61faed52 files/pg_autovacuum.init-7.4.9 1414
 MD5 62959a2ffd56e0e360b1437467c573a7 files/pg_autovacuum.init-8.0.1 1414
 MD5 9b0d09ffaaa125d93a200e3783af23cc files/pg_autovacuum.init-8.0.3 1414
 MD5 3d69e95f9646cfacb2ba866b3b6bd2af files/pg_autovacuum.init-8.0.4 1414
-MD5 61b463e796709e035216374cb149d614 files/postgresql-7.3.10-gentoo.patch 1741
-MD5 7fad73889572ccdf114ce0024e7170c6 files/postgresql-7.3.11-gentoo.patch 1741
-MD5 4501816025cc701e272b5e57937d0de0 files/postgresql-7.3.9-gentoo.patch 529
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.7 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.8 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.9 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.1 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.3 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.4 302
 MD5 dbe0601754b798a4d08f080137a57c43 files/postgresql-7.3.9-securityfix.patch 1443
+MD5 4501816025cc701e272b5e57937d0de0 files/postgresql-7.3.9-gentoo.patch 529
+MD5 1b27a8ad9d652b6d292ff34ad385b208 files/postgresql-7.4.8-gentoo.patch 1729
+MD5 3665230043dd69d562482d92f2d08286 files/postgresql-8.0.1-gentoo.patch 808
+MD5 66ade3cf803c867e04bb2ab9dfde3dbf files/postgresql-8.1.0-gentoo.patch 1200
+MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r2 223
+MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9-r1 223
+MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r1 290
+MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r2 290
 MD5 e91e3b293273f041b209aa65ff6ceebc files/postgresql-7.4.7-gentoo.patch 1160
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.7-hppa-testandset.patch 1596
-MD5 df4fedbfa30df690a6f78da9f5a44196 files/postgresql-7.4.7-securityfix.patch 1773
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918
-MD5 1b27a8ad9d652b6d292ff34ad385b208 files/postgresql-7.4.8-gentoo.patch 1729
-MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.8-hppa-testandset.patch 1596
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.8-vacuum-delay.patch 8918
-MD5 64cac596c308b19865f5738cc5af02b1 files/postgresql-7.4.9-gentoo.patch 1729
-MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.9-hppa-testandset.patch 1596
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.9-vacuum-delay.patch 8918
 MD5 8ec4fecf36cf856f2d3afc97419c2f93 files/postgresql-8.0.1-gentoo-libpq.patch 1200
-MD5 3665230043dd69d562482d92f2d08286 files/postgresql-8.0.1-gentoo.patch 808
-MD5 4591d7bc6524b885854c18bb9b9ce23a files/postgresql-8.0.1-securityfix.patch 1850
-MD5 01f69b667825048f2e9807555b79b73d files/postgresql-8.0.3-gentoo.patch 1200
+MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
 MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.0.3-sh.patch 618
+MD5 314c9147f25d4676c60a4761bbe500e2 files/digest-postgresql-7.3.10 226
+MD5 419268f051162aee7f36e9c0b384fcc1 files/digest-postgresql-7.3.11 226
+MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.8-hppa-testandset.patch 1596
+MD5 7fad73889572ccdf114ce0024e7170c6 files/postgresql-7.3.11-gentoo.patch 1741
 MD5 01f69b667825048f2e9807555b79b73d files/postgresql-8.0.4-gentoo.patch 1200
-MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.0.4-sh.patch 618
-MD5 66ade3cf803c867e04bb2ab9dfde3dbf files/postgresql-8.1.0-gentoo.patch 1200
-MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.1.0-sh.patch 618
-MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.7 390
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.8 390
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.9 390
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.1 390
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.3 390
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.4 390
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.1.0 390
-MD5 3273c43da88db8e7fa5fd9c413f651c5 files/postgresql.init-7.3.10 1280
-MD5 4165a3ef6d3e253340b56c719a866c87 files/postgresql.init-7.3.11 1280
-MD5 6237c18ae647e118e23425e3cb28c8aa files/postgresql.init-7.3.6 1279
-MD5 5d90779b8c5b7d63ea0846f2a534fc87 files/postgresql.init-7.3.9 1279
-MD5 8b2a2b4c8f40a1fdbe73d7a6fbcfb6fe files/postgresql.init-7.4.7 1279
-MD5 eae31db55e9908de6d955d3efc931bbc files/postgresql.init-7.4.8 1279
-MD5 37e9be11579a5dd887ea56898555a013 files/postgresql.init-7.4.9 1279
-MD5 fe44693b90eef9cf0b6118edb258da16 files/postgresql.init-8.0.1 1279
-MD5 b7252dad787e4e9f4d645a47d7f74ad8 files/postgresql.init-8.0.3 1279
-MD5 11eb946998d42bb657f9408b804b3099 files/postgresql.init-8.0.4 1279
-MD5 d41a81e2e89a457cd171237bab44c8a0 files/postgresql.init-8.1.0 1279
-MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 68b207bf92c9fb56d7911c0b5af6cc9b postgresql-7.3.10.ebuild 8138
-MD5 df1ce9230106e5853fb50850305ca2ba postgresql-7.3.11.ebuild 8305
-MD5 c25c9a7ffe3a89d13b05d6030f4d9889 postgresql-7.3.6-r2.ebuild 7837
-MD5 2265cba6143f2d8471e41be421367c5b postgresql-7.3.9-r1.ebuild 8028
-MD5 993f8413e91946fb334582c36b39afcb postgresql-7.4.7-r1.ebuild 10701
-MD5 08e125da5fd9e78854a2eb23f78274c3 postgresql-7.4.7-r2.ebuild 10854
-MD5 e04819f89769e06c3ff5d0019ea1f46c postgresql-7.4.8.ebuild 10569
-MD5 f468afa31445f55ae2a035dba1e0911f postgresql-7.4.9.ebuild 10739
-MD5 b0b94d20c7d268d602aa6c60e0ce5ce9 postgresql-8.0.1-r3.ebuild 7735
-MD5 99f4b845820fa12720b8eecec8085c56 postgresql-8.0.1-r4.ebuild 7824
-MD5 0ab1b6f2bce8c619c7824a648f44667b postgresql-8.0.3.ebuild 7510
-MD5 139b7ac3104b67db427da2074f54941b postgresql-8.0.4.ebuild 7681
-MD5 d622d522e0a17e7597b0b14f8dcdee17 postgresql-8.1.0.ebuild 7622
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDghYucsIHjyDViGQRAvzeAKDlBmWwIEglP+xcOupAzPpeHX7gMgCgvzmp
-RuEkJ2udvDXAMuMCG5+vuGE=
-=TcHw
------END PGP SIGNATURE-----
+MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.9-hppa-testandset.patch 1596
diff --git a/dev-db/postgresql/postgresql-8.1.0.ebuild b/dev-db/postgresql/postgresql-8.1.0.ebuild
index 7cf96bac4e07..52cdbbc5a51c 100644
--- a/dev-db/postgresql/postgresql-8.1.0.ebuild
+++ b/dev-db/postgresql/postgresql-8.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.0.ebuild,v 1.3 2005/11/12 23:09:52 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.0.ebuild,v 1.4 2005/11/23 04:12:06 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -49,7 +49,7 @@ pkg_setup() {
 	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
 		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
 		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
-		if [ ${PG_MAJOR} -lt 8 ] || [ ${PG_MAJOR} -eq 8 -a ${PG_MINOR} -lt 0 ] ; then
+		if [ ${PG_MAJOR} -lt 8 ] || [ ${PG_MAJOR} -eq 8 -a ${PG_MINOR} -lt 1 ] ; then
 			eerror "Postgres ${PV} cannot upgrade your existing databases, you must"
 			eerror "use pg_dump to export your existing databases to a file, and then"
 			eerror "pg_restore to import them when you have upgraded completely."