summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-11-30 19:03:28 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-11-30 19:03:28 +0000
commit0be1e3db7a6a12c23c9a6f2b30c7ca5ed8ce7510 (patch)
treef98fdc12517ccd33d8d735836bdaa0b09e6a04cc /app-office
parentRevision bump: EAPI 4, add ~amd64 keyword, respect LDFLAGS wrt bug #337359, d... (diff)
downloadgentoo-2-0be1e3db7a6a12c23c9a6f2b30c7ca5ed8ce7510.tar.gz
gentoo-2-0be1e3db7a6a12c23c9a6f2b30c7ca5ed8ce7510.tar.bz2
gentoo-2-0be1e3db7a6a12c23c9a6f2b30c7ca5ed8ce7510.zip
Do not display the cups msg unless needed.
(Portage version: 2.2.0_alpha143/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice-bin/ChangeLog6
-rw-r--r--app-office/libreoffice-bin/libreoffice-bin-3.6.3.2.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index febb1a9a4d76..28070c961c5a 100644
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice-bin
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.96 2012/11/24 21:47:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.97 2012/11/30 19:03:28 scarabeus Exp $
+
+ 30 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-bin-3.6.3.2.ebuild:
+ Do not display the cups msg unless needed.
24 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
libreoffice-bin-3.6.3.2.ebuild:
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.6.3.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.6.3.2.ebuild
index f07d7b93a264..17f68131a624 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.6.3.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.6.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.6.3.2.ebuild,v 1.3 2012/11/24 21:47:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.6.3.2.ebuild,v 1.4 2012/11/30 19:03:28 scarabeus Exp $
EAPI=5
@@ -177,7 +177,7 @@ pkg_postinst() {
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
- use cups || \
+ use cups && ! has_version net-print/cups || \
ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
use java || \