From 116e5c7cb9f132e493c36c77987956175ad2128a Mon Sep 17 00:00:00 2001 From: "Andreas K. Hüttel" Date: Sun, 15 Feb 2015 19:58:47 +0000 Subject: Improve repoman happiness (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 84AD142F) --- app-office/libreoffice/ChangeLog | 7 ++++++- app-office/libreoffice/libreoffice-4.3.9999.ebuild | 4 ++-- app-office/libreoffice/libreoffice-4.4.9999.ebuild | 4 ++-- app-office/libreoffice/libreoffice-9999.ebuild | 8 ++++---- app-office/libreoffice/metadata.xml | 2 -- 5 files changed, 14 insertions(+), 11 deletions(-) (limited to 'app-office') diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 24c993d0006f..978f6955a6c2 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.616 2015/02/15 19:41:23 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.617 2015/02/15 19:58:47 dilfridge Exp $ + + 15 Feb 2015; Andreas K. Huettel + libreoffice-4.3.9999.ebuild, libreoffice-4.4.9999.ebuild, + libreoffice-9999.ebuild, metadata.xml: + Improve repoman happiness 15 Feb 2015; Andreas K. Huettel libreoffice-4.4.0.3.ebuild: diff --git a/app-office/libreoffice/libreoffice-4.3.9999.ebuild b/app-office/libreoffice/libreoffice-4.3.9999.ebuild index ca2b226a4aa8..1f07fe092606 100644 --- a/app-office/libreoffice/libreoffice-4.3.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.3.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.14 2015/02/15 16:44:40 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.15 2015/02/15 19:58:47 dilfridge Exp $ EAPI=5 @@ -133,7 +133,7 @@ COMMON_DEPEND=" >=media-libs/glew-1.10 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 - >=media-libs/libpng-1.4 + >=media-libs/libpng-1.4:0= >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 >=media-libs/libvisio-0.1.0 diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild index 6b9c07ba667e..f70ce1cd4232 100644 --- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.4 2015/02/15 16:44:40 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.5 2015/02/15 19:58:47 dilfridge Exp $ EAPI=5 @@ -130,7 +130,7 @@ COMMON_DEPEND=" >=media-libs/glew-1.10 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 - >=media-libs/libpng-1.4 + >=media-libs/libpng-1.4:0= >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index ce6bccb982bc..faf14fa609a7 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.27 2015/02/08 22:42:18 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.28 2015/02/15 19:58:47 dilfridge Exp $ EAPI=5 @@ -27,7 +27,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" -inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} +inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="LibreOffice, a full office productivity suite" @@ -130,7 +130,7 @@ COMMON_DEPEND=" >=media-libs/glew-1.10 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 - >=media-libs/libpng-1.4 + >=media-libs/libpng-1.4:0= >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker @@ -196,7 +196,7 @@ RDEPEND="${COMMON_DEPEND} " if [[ ${PV} != *9999* ]]; then - PDEPEND="~app-office/libreoffice-l10n-${PV}" + PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" else # Translations are not reliable on live ebuilds # rather force people to use english only. diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index 3893f228eecd..757568b84782 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -15,8 +15,6 @@ version Use dev-libs/jemalloc for allocations Build the Office Development Kit Enable document colaboration features using telepathy communication framework. - Enable support for VBA compatibility and ActiveX embedding Use media-video/vlc for video embedding - Adds support for HTTP content adding via net-libs/neon -- cgit v1.2.3-65-gdbad