diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2013-06-20 11:40:50 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-06-20 11:40:50 +0000 |
| commit | 0ca0f154b2dffc0e5727053344b9e5c4d917643e (patch) | |
| tree | 8e3cfdfb49fb0b48ab32438e224a6f90a74acdae /app-office/libreoffice | |
| parent | Version bump to 4.0.4 drop 4.0.3. (diff) | |
| download | gentoo-2-0ca0f154b2dffc0e5727053344b9e5c4d917643e.tar.gz gentoo-2-0ca0f154b2dffc0e5727053344b9e5c4d917643e.tar.bz2 gentoo-2-0ca0f154b2dffc0e5727053344b9e5c4d917643e.zip | |
Version bump to 4.0.4.2. Fixes bug#473806 and bug#473848. Drop 4.0.3.
(Portage version: 2.2.0_alpha181/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 9 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.0.4.2.ebuild (renamed from app-office/libreoffice/libreoffice-4.0.3.3.ebuild) | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.0.9999.ebuild | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.1.9999.ebuild | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 7 |
5 files changed, 18 insertions, 10 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 69e84ad232b0..f31c46c51c9a 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.476 2013/06/04 10:32:51 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.477 2013/06/20 11:40:50 scarabeus Exp $ + +*libreoffice-4.0.4.2 (20 Jun 2013) + + 20 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> +libreoffice-4.0.4.2.ebuild, + -libreoffice-4.0.3.3.ebuild, libreoffice-4.0.9999.ebuild, + libreoffice-4.1.9999.ebuild, libreoffice-9999-r2.ebuild: + Version bump to 4.0.4.2. Fixes bug#473806 and bug#473848. Drop 4.0.3. 04 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: Raise dependency over doxygen package. diff --git a/app-office/libreoffice/libreoffice-4.0.3.3.ebuild b/app-office/libreoffice/libreoffice-4.0.4.2.ebuild index b8ffd1969601..b611ba43b065 100644 --- a/app-office/libreoffice/libreoffice-4.0.3.3.ebuild +++ b/app-office/libreoffice/libreoffice-4.0.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.3.3.ebuild,v 1.2 2013/05/11 11:23:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.4.2.ebuild,v 1.1 2013/06/20 11:40:50 scarabeus Exp $ EAPI=5 @@ -259,7 +259,7 @@ pkg_pretend() { fi # ensure pg version - if use postgres; then + if use postgres && has_version dev-db/postgresql-base; then pgslot=$(postgresql-config show) if [[ ${pgslot//.} < 90 ]] ; then eerror "PostgreSQL slot must be set to 9.0 or higher." diff --git a/app-office/libreoffice/libreoffice-4.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild index 7b82ed132fa3..c4428e135d94 100644 --- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.0.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.30 2013/05/11 11:23:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.31 2013/06/20 11:40:50 scarabeus Exp $ EAPI=5 @@ -259,7 +259,7 @@ pkg_pretend() { fi # ensure pg version - if use postgres; then + if use postgres && has_version dev-db/postgresql-base; then pgslot=$(postgresql-config show) if [[ ${pgslot//.} < 90 ]] ; then eerror "PostgreSQL slot must be set to 9.0 or higher." diff --git a/app-office/libreoffice/libreoffice-4.1.9999.ebuild b/app-office/libreoffice/libreoffice-4.1.9999.ebuild index 5e2dd7ea4e7a..a9f5dc92a859 100644 --- a/app-office/libreoffice/libreoffice-4.1.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.1.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 1.2 2013/05/27 13:21:27 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 1.3 2013/06/20 11:40:50 scarabeus Exp $ EAPI=5 @@ -260,7 +260,7 @@ pkg_pretend() { fi # ensure pg version - if use postgres; then + if use postgres && has_version dev-db/postgresql-base; then pgslot=$(postgresql-config show) if [[ ${pgslot//.} < 90 ]] ; then eerror "PostgreSQL slot must be set to 9.0 or higher." diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index a77ddf10e083..7c29c74d90c8 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.177 2013/06/04 10:32:51 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.178 2013/06/20 11:40:50 scarabeus Exp $ EAPI=5 @@ -259,8 +259,9 @@ pkg_pretend() { fi fi - # ensure pg version - if use postgres; then + # Ensure pg version but we have to be sure the pg is installed (first + # install on clean system) + if use postgres && has_version dev-db/postgresql-base; then pgslot=$(postgresql-config show) if [[ ${pgslot//.} < 90 ]] ; then eerror "PostgreSQL slot must be set to 9.0 or higher." |