| 1 |
scarabeus 11/11/18 23:11:14 |
| 2 |
|
| 3 |
Modified: libreoffice-9999-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add postgresql useflag. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 app-office/libreoffice/libreoffice-9999-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: libreoffice-9999-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- libreoffice-9999-r2.ebuild 14 Nov 2011 09:06:35 -0000 1.4 |
| 23 |
+++ libreoffice-9999-r2.ebuild 18 Nov 2011 23:11:14 -0000 1.5 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.4 2011/11/14 09:06:35 scarabeus Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.5 2011/11/18 23:11:14 scarabeus Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
@@ -69,8 +69,8 @@ |
| 33 |
unset ADDONS_SRC |
| 34 |
|
| 35 |
IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk |
| 36 |
-+jemalloc kde mysql +nsplugin odk opengl pdfimport svg test +vba +webdav |
| 37 |
-+xmlsec" |
| 38 |
++jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba |
| 39 |
++webdav +xmlsec" |
| 40 |
LICENSE="LGPL-3" |
| 41 |
SLOT="0" |
| 42 |
[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
| 43 |
@@ -135,6 +135,7 @@ |
| 44 |
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) |
| 45 |
opengl? ( virtual/opengl ) |
| 46 |
pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) |
| 47 |
+ postgres? ( >=dev-db/postgresql-base-8.4.0 ) |
| 48 |
svg? ( gnome-base/librsvg ) |
| 49 |
webdav? ( net-libs/neon ) |
| 50 |
xmlsec? ( ${NSS_DEPEND} ) |
| 51 |
@@ -200,6 +201,8 @@ |
| 52 |
S="${WORKDIR}/${PN}-core-${PV}" |
| 53 |
|
| 54 |
pkg_pretend() { |
| 55 |
+ local pgslot |
| 56 |
+ |
| 57 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 58 |
CHECKREQS_MEMORY="1G" |
| 59 |
use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G" |
| 60 |
@@ -210,6 +213,16 @@ |
| 61 |
die "Too old gcc found." |
| 62 |
fi |
| 63 |
fi |
| 64 |
+ |
| 65 |
+ # ensure pg version |
| 66 |
+ if use postgres; then |
| 67 |
+ pgslot=$(postgresql-config show) |
| 68 |
+ if [[ ${pgslot//.} < 84 ]] ; then |
| 69 |
+ eerror "PostgreSQL slot must be set to 8.4 or higher." |
| 70 |
+ eerror " postgresql-config set 8.4" |
| 71 |
+ die "PostgreSQL slot is not set to 8.4 or higher." |
| 72 |
+ fi |
| 73 |
+ fi |
| 74 |
} |
| 75 |
|
| 76 |
pkg_setup() { |
| 77 |
@@ -423,6 +436,7 @@ |
| 78 |
$(use_enable odk) \ |
| 79 |
$(use_enable opengl) \ |
| 80 |
$(use_enable pdfimport ext-pdfimport) \ |
| 81 |
+ $(use_enable postgres ext-postgresql-sdbc) \ |
| 82 |
$(use_enable svg librsvg system) \ |
| 83 |
$(use_enable test linkoo) \ |
| 84 |
$(use_enable vba) \ |
| 85 |
|
| 86 |
|
| 87 |
|
| 88 |
1.203 app-office/libreoffice/ChangeLog |
| 89 |
|
| 90 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.203&view=markup |
| 91 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.203&content-type=text/plain |
| 92 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.202&r2=1.203 |
| 93 |
|
| 94 |
Index: ChangeLog |
| 95 |
=================================================================== |
| 96 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v |
| 97 |
retrieving revision 1.202 |
| 98 |
retrieving revision 1.203 |
| 99 |
diff -u -r1.202 -r1.203 |
| 100 |
--- ChangeLog 14 Nov 2011 09:06:35 -0000 1.202 |
| 101 |
+++ ChangeLog 18 Nov 2011 23:11:14 -0000 1.203 |
| 102 |
@@ -1,6 +1,10 @@ |
| 103 |
# ChangeLog for app-office/libreoffice |
| 104 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 105 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.202 2011/11/14 09:06:35 scarabeus Exp $ |
| 106 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.203 2011/11/18 23:11:14 scarabeus Exp $ |
| 107 |
+ |
| 108 |
+ 18 Nov 2011; Tomáš Chvátal <scarabeus@g.o> |
| 109 |
+ libreoffice-9999-r2.ebuild: |
| 110 |
+ Add postgresql useflag. |
| 111 |
|
| 112 |
14 Nov 2011; Tomáš Chvátal <scarabeus@g.o> |
| 113 |
libreoffice-9999-r2.ebuild: |
Archives