Add postgresql useflag.

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index ec081880eb0088f7e4fe9120e014353d80fc30eb..fdb8e9a8ab9775b32edc0b670313c9561e3df838 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.202 2011/11/14 09:06:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.203 2011/11/18 23:11:14 scarabeus Exp $
+
+  18 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-9999-r2.ebuild:
+  Add postgresql useflag.
 
   14 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-9999-r2.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 392583ac4edbc4c92bdb77cbf10cd2ff23e35c9a..85382e98046e66816300379856352a562ecad037 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -175,23 +175,23 @@ EBUILD libreoffice-3.3.4.ebuild 18266 RMD160 c0204063e1a6bd7621267fd4dc92d8b7334
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 08657e1067a7769b11aa1a095a9e755a478f9a24 SHA1 035c05abc1ccc7fd3834ebc0150103be35bec5eb SHA256 4265eb3af09948f4145550f372ad3d632ca36472ec461aa93d2fcbea4a27d242
 EBUILD libreoffice-3.4.4.2-r1.ebuild 16541 RMD160 c7ceaab85af40e4ba3fc4eec2d0525301b17c819 SHA1 f76f95c4499831be5154ef2fea8993d86078e23d SHA256 13ee29e0f298ef5b80066cf40b24da0947e07cab675663ccbbf2ddd35d7ab5a3
 EBUILD libreoffice-3.4.9999-r2.ebuild 15030 RMD160 3153aacc42fd42e13d15c3608f12f6a211fe2276 SHA1 de53d2831feb106cf8542c47787b03c6a146250c SHA256 0516f39c816c3e86d8ce3ab63213e144f4e3c06b6694a037831a87f29e97d82b
-EBUILD libreoffice-9999-r2.ebuild 13357 RMD160 697db95ffd943adb2ce33f23eb01d137ecf4f792 SHA1 09eecb638a5a9b94e1f444f5cb154d9c0cad2cab SHA256 3518cb64b78df3261eef3efe79dea50170a11712ab2b2ce458c3de0cb81a8e81
-MISC ChangeLog 36870 RMD160 a9eb75cb709dcee4c72692bc58e68127884193e1 SHA1 75123d4aaa1c17b9fc3f6b623aa2e4750c4b0ab2 SHA256 fbcbd8e08b2788338a2c0d94162c1b5e80669b56d94777764eab404be7cadf6c
+EBUILD libreoffice-9999-r2.ebuild 13757 RMD160 5fdd57fe4c92ac06a91e87720fecad437fbfe537 SHA1 cddc6acf88540c1c646b5f2bb9ede126da303d0e SHA256 408a0e0bf507170254552e15b72922bb6056c67cb47b41d5eec2d525784ddc45
+MISC ChangeLog 36982 RMD160 79239b898e20249affc035af1204fa638a47fecf SHA1 5e7e64ec0ee08ae774cfce4634ab0fe941d5ecca SHA256 fb1c50669f3bb338f79fa1b843712174bf2f6a93d7f7d8784ce58c7ada09dbea
 MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOwNoJAAoJEOSiRoyO7jvoeawP/3aIg/9WShV5yInXZWS5BvkB
-k7+9ELWV3RTVNpzHAYjyZdCmyn6xmNxS9MDopo6t4XUVLhc99UazbO+qdOTJpIXD
-jEcYtzLS0vhnrb/3oqo/XKecUFNMdKP9QCdD5MGrWsJZ+7G0VR0T81DC02bwHCGz
-Nn23erJ3aXo12vRI0DBY7JpAdEqsjgfvh63RJbkOFRbx3dlbsyfSN4rv4sGswX3l
-zKktw7yTTDBReXSRUoC8AHQh6V2yuAFe6ZgH7t2m97UHGbBao8T5J4X/B8jjOiz9
-4BVNqXv9uujc133GwO+l4lyzF7gPrv3imE1XHTf/VunnitB4y1T21z2xfSnHaUPe
-TvXRIVAvq9urSc5seoJfY4faTDtEzSgPn2zn8wmV/3ddKxOn/CBB6X9YH1a96YoO
-oj0ayA8W8T4pKK4D2dOtD6ttySOq0z/UiDMbbQLeXtMWL85OwjPiNjP4YOe0YkEL
-04kM0lKMvZRSiX+Eoc9i1XVqVlnPbzjXywjkzFKdE0f4DzDwfA52ZfqohBaVKl7V
-ye1yy2tJMF+ihxvRjJkATMzwGy3X8hRZ5CP82Sg+iZ/ug9/qlnUsrdXhhy9vJMk7
-7DWUm8g+Xnd6w7qnQWHSAcLzR/pyWUHogGdOwdBvTwgNQSSy64CtT7DN3yxBFwEl
-JozOLPaBo4ZT7Mq3/ALA
-=qh8d
+iQIcBAEBAgAGBQJOxuY1AAoJEOSiRoyO7jvo6TcQAKq1ihDOvbXheg1KcZdx6Rfa
+aI68mhMtEtz0oiCfSv4eDPF4tNmf82+BHHQDbfodyCt2yjphNYJn7aL67Ml9g+EG
+Finj16K8eCff8g3AJ9xMyjoUnC1RWC7McY8jkhfiy726AGKbHvxJo2k44fYzXFHp
+P3zjzyWKwnxLMcjnd3NquSiH7dWU5q6mZTaoLzGMHzrh8wkUXWyP+COMQVzZvYZb
+8LAib1UBvZBEDLhu7f8psRC8A8A3HFe8FbeoU2LGwOvHRaLdPQr/6bJbRSehVx7k
+Zmv3iPOhQ22SpWehXMlgmCCsJXuResCsaJeGDJIXb7DnMG30X+8dKCe4B/ZEtHg7
+vieT1fSGWIoTe1/rIiZlqymeXbt5POPzv01NivDoAoJz25cpwW6qLr9do9Ylt8FB
+cGukqiOGw7nEJtcN0eI+3iVsYMnZEgvduO/UIDU1zMyNd2qe71+vbvWuxGxp8ir8
+v8qL2N3itBfpbi++UQsr1LpjsOvdKsPJQi7+8qzskCp5FzAyQ4XaGN5EwyeR6ckh
+ES2QZcbWIYL7rLNkJz2hybL6oF1E998Kl/UKR1ovIGi6ADIkh5L3pR0Px08XQMJh
+fRZz81NUz4YlF/yz3KUpezzFtcCazNNNGdmp/t4LDJqrZWIMD2CQC/v/JDZ7Wkix
+mn60xuUv34+NfrNQ5Aq2
+=i2q1
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 9b8ff9624939d0733291977bd6c1e21a878532ab..e770bf2756043c4b049f4e72e5d60b0da8fd9724 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.4 2011/11/14 09:06:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.5 2011/11/18 23:11:14 scarabeus Exp $
 
 EAPI=4
 
@@ -69,8 +69,8 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk
-+jemalloc kde mysql +nsplugin odk opengl pdfimport svg test +vba +webdav
-+xmlsec"
++jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
++webdav +xmlsec"
 LICENSE="LGPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
@@ -135,6 +135,7 @@ COMMON_DEPEND="
        mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
        opengl? ( virtual/opengl )
        pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] )
+       postgres? ( >=dev-db/postgresql-base-8.4.0 )
        svg? ( gnome-base/librsvg )
        webdav? ( net-libs/neon )
        xmlsec? ( ${NSS_DEPEND} )
@@ -200,6 +201,8 @@ REQUIRED_USE="
 S="${WORKDIR}/${PN}-core-${PV}"
 
 pkg_pretend() {
+       local pgslot
+
        if [[ ${MERGE_TYPE} != binary ]]; then
                CHECKREQS_MEMORY="1G"
                use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
@@ -210,6 +213,16 @@ pkg_pretend() {
                        die "Too old gcc found."
                fi
        fi
+
+       # 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."
+                fi
+       fi
 }
 
 pkg_setup() {
@@ -423,6 +436,7 @@ src_configure() {
                $(use_enable odk) \
                $(use_enable opengl) \
                $(use_enable pdfimport ext-pdfimport) \
+               $(use_enable postgres ext-postgresql-sdbc) \
                $(use_enable svg librsvg system) \
                $(use_enable test linkoo) \
                $(use_enable vba) \