Solve the pgsql build issue by requiring 9.0 or later.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 209f48bf4a221e002d8fe69cba125b6953342495..76d4fbdf0b26411234eeb40b25d9d3df93123a85 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.210 2011/12/04 15:51:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.211 2011/12/04 15:53:40 scarabeus Exp $
+
+  04 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.5.0.0.ebuild, libreoffice-9999-r2.ebuild:
+  Solve the pgsql build issue by requiring 9.0 or later.
 
   04 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.5.0.0.ebuild, libreoffice-9999-r2.ebuild, metadata.xml:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c5768a35fd214b8e9d5468ee8e94d13e26e5c586..8c9bbeaeb303644fa1cdcd2eb0dc91c9360598b0 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -178,24 +178,24 @@ EBUILD libreoffice-3.3.4.ebuild 18266 RMD160 c0204063e1a6bd7621267fd4dc92d8b7334
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 f97b7a6b4af7c5187fece7d7c233fc4f17d84449 SHA1 51ea539199105d8edb52f65e930e9580f4bdafc3 SHA256 392e764b95e09716f031ef22118e1eed25a892c75876b3614012b3743ec801db
 EBUILD libreoffice-3.4.4.2-r1.ebuild 16541 RMD160 f08a3b1e7826d489a580087b1638a4b98acfbca8 SHA1 f81fb848f6895c3c947fc56f0aef0963f15c93e3 SHA256 9c8adc1a3c217697dcaa7eb3722ae84b47926a9119c39f53b330243bd4b81ed4
 EBUILD libreoffice-3.4.9999-r2.ebuild 14991 RMD160 7abb80f9936495407114fa70260a6fc0f859fa07 SHA1 9f98e13f004793ce15a7285fe7bb2e9860ee31df SHA256 302684d2d6ccdb7ed8a48068f101d0b04037d6ff413bf8b3feccaf9141f19db7
-EBUILD libreoffice-3.5.0.0.ebuild 14007 RMD160 d0f9c702109a4f3d0847847cfa12eb8c3dd4b676 SHA1 1dd79506bb6cb7d4d666a44ad4a6873350dc779e SHA256 6a71a7843dd2effe28d42ffa43036182a916539a81dedc09eb56a78628285ba6
-EBUILD libreoffice-9999-r2.ebuild 14008 RMD160 654a4754caae39e33f6dc613fe241c6879c966c8 SHA1 e55579fd9c6356d537e52a04f9d1704c31604b53 SHA256 569bf53e1a5fa4dff7ce1a3f7cb73f8ab296a1ee8193bbb2af3898f7c850edaf
-MISC ChangeLog 38028 RMD160 4fac324a9cae998935b2f46c58216394bec3f30f SHA1 8e5352c073518b00b91311e4aaef2ddca8022465 SHA256 aa10ab2a4cd0c9b5611973aeb43df3a877a387b471dc85e926321d8f48166cbd
+EBUILD libreoffice-3.5.0.0.ebuild 14007 RMD160 720a4c381e131a6e826edb976b46ca9cfc5f85e9 SHA1 99f4175284365c9bf328f7888f203a52a85278c0 SHA256 bdbdecddc996c5db2c702a109b00d9a5782acf3dd49a30d0534526d7a6a35a88
+EBUILD libreoffice-9999-r2.ebuild 14008 RMD160 4d7c683b8b81c0a6330b6b61f91756ce5cd14477 SHA1 e65b02347099879eb53a1736d54bfeacf03754ea SHA256 6e49e0864a49c1770e0ef93ad04233fe9a713935924702622f38f382ec8ca744
+MISC ChangeLog 38199 RMD160 28aec6e1f963d7cd2cc6226bf7695f86272fbab6 SHA1 2dd5f09cd6b734c39bb9f76264061a934993482a SHA256 54203e0b4233e714071d19f53ba5bcfaef553da35337c89c318283b0515989ba
 MISC metadata.xml 1409 RMD160 9861b490a44757ecaebb14ac28eec292f347ac3f SHA1 268b78192669f12c513fd7b68fe588f140ea2e1b SHA256 862a214105b2f7b07a015d656794aac9b94a3f40b3f8cbf74a5299f990b82b2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO25byAAoJEOSiRoyO7jvoKw8P/0TVfw7/uGqa+IYxFMCwA1wU
-gtDVgboQ0bCNpjPKAMog2ymN1GVYmWwyIORT2JyOBiCWOeDTJgtnUSD2GGQCM/Cr
-xPtowUNuPZwSFuIcaucsKXwBz90vJpL2DdOUPJnhCZxiguKKLq5MAuMtJAiBRZ8k
-CIbyBJtV+sUhZ63JX+G35MIPnbbNEQG3qA9GlkCAoUo2zp4Gtj8yAuGev2W/tktB
-P2IgiuOtlFXZHLX6r/hoe6ufA0OeY6p/6V8mKalYS5UJ+lKq1UHkfmD0kgQdPWCS
-XVuIfGDIMQ08LaOWg+FbYyUDYUdh9yREHqXQRQ6B3sVAtqV5bCtxdNFJn8Bkz2rx
-ka3+OSAam8QgWwNr5P75/IIO6OAHYR2jIK71fk2kn990YpCarTTYg5LwC5tsyhmA
-gB8CutY8TOdiOZ+AMchRepNSLA86ZUSJt84l7n1AHnLHn2cEkOUtwTcrm/yYJvPm
-KMfIYiPAEnj/DENCxyIm2sd6XabeUrmkisQZQX1DofQ6TQG6ZhVP/Rlkdh/4oYgs
-Qpl6nqJ9lfUcOIBS33vIKA2YwKxb/7jFwe7oneu6mMJdAGFLVM42pS9JBFgFBmG5
-tKgNuQrK2BSm2z4IpNPvFCeh711dfAKZCGl8I1J+BaRGPjRVXyu4A0stU0ZWDRr2
-P8sIIQQxNe1C9DkwgDyB
-=I48j
+iQIcBAEBAgAGBQJO25eAAAoJEOSiRoyO7jvoavYP/i4Il+UCfQFdDFKIeAgke3Jb
+OIL9z9kswqXO6PoxxEfWV/49ZdrfDYRStzYDisyaDQ4qnIFVuTS7zhhu8mBFEw+2
+GSx/H+SroVbuit1CMVLna/koURyjOBK2ja8l4MHLPUUoTw9GMLnze2Nhpcsd8pKr
+M1IB6HBYh7nRK0XSW2Wz6ByP9r4Pr6gV7Ii7cNpjgCjkqKqEUcEykxoLO2rSCqn2
+pOy6OUUpm+U6ZbgWMY1ZOZ91+tag2dfWJvUAJcCHSivptLTVgFGobgBV+icGHLvv
+y6os0Z8CGTsZHVDb2ocuUExUNjuVIxc/rXrtSEbb+WSbjgTfQRB6lH9zeInAy6pL
+4OiL/+Kp1nOL8H2197ViM2efp8nnQNrp1tgWlA6ZUsjm3UDyiUrOlv3Xr2kh+YCh
+dQdU3iusCUZ0sPcyr3nrthDvb1ZSgSoBMFLBjW1iJOrmHLqlbYxcW91uTCJcjYWl
+SiSD+CJwZSRd518aFjGKMRDuJZi9sGq4BERtDj4TmxXZu4g5t1vMDOVjJOLTrnX4
+767oG6lfLz6fm/PaIf+Hhai0d7HlHXn21x2QutlZFAQUJM/WLCkTJSjHXcAqYC36
+NDz0z5vFbLIHT5SljwolQBfNHQd8KUmWXKSKXONAM3siT/yTzT0skLmeYmUkLEOu
+Yvb3cVGzjX5s015XxETa
+=c10S
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.5.0.0.ebuild b/app-office/libreoffice/libreoffice-3.5.0.0.ebuild
index c2dcca4d094fb118d6d18a725492bf724ab71b89..0562586b47bef3e2297a81207a22ccb571aa8245 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.5.0.0.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.0.0.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/app-office/libreoffice/libreoffice-3.5.0.0.ebuild,v 1.3 2011/12/04 15:51:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.0.ebuild,v 1.4 2011/12/04 15:53:40 scarabeus Exp $
 
 EAPI=4
 
@@ -215,10 +215,10 @@ pkg_pretend() {
        # ensure pg version
        if use postgres; then
                 pgslot=$(postgresql-config show)
-                if [[ ${pgslot//.} < 84 ]] ; then
-                       eerror "PostgreSQL slot must be set to 8.4 or higher."
-                       eerror "    postgresql-config set 8.4"
-                       die "PostgreSQL slot is not set to 8.4 or higher."
+                if [[ ${pgslot//.} < 90 ]] ; then
+                       eerror "PostgreSQL slot must be set to 9.0 or higher."
+                       eerror "    postgresql-config set 9.0"
+                       die "PostgreSQL slot is not set to 9.0 or higher."
                 fi
        fi
 }

diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index d607875aef03084757520e097cff5ad8d32978c6..74952b0be850eaebc55ceea892b80b5f6fb74224 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.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/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.11 2011/12/04 15:51:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.12 2011/12/04 15:53:40 scarabeus Exp $
 
 EAPI=4
 
@@ -215,10 +215,10 @@ pkg_pretend() {
        # ensure pg version
        if use postgres; then
                 pgslot=$(postgresql-config show)
-                if [[ ${pgslot//.} < 84 ]] ; then
-                       eerror "PostgreSQL slot must be set to 8.4 or higher."
-                       eerror "    postgresql-config set 8.4"
-                       die "PostgreSQL slot is not set to 8.4 or higher."
+                if [[ ${pgslot//.} < 90 ]] ; then
+                       eerror "PostgreSQL slot must be set to 9.0 or higher."
+                       eerror "    postgresql-config set 9.0"
+                       die "PostgreSQL slot is not set to 9.0 or higher."
                 fi
        fi
 }