summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2013-07-27 17:41:49 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2013-07-27 17:41:49 +0000
commit960b6c85a5cac54709ae626277830e74dad33d15 (patch)
treec9b868b975d9d81afb9c0d827216c807cf748a42 /app-office
parentAdd dep markdown, make dep transfig unconditional, sed statement to correct l... (diff)
downloadgentoo-2-960b6c85a5cac54709ae626277830e74dad33d15.tar.gz
gentoo-2-960b6c85a5cac54709ae626277830e74dad33d15.tar.bz2
gentoo-2-960b6c85a5cac54709ae626277830e74dad33d15.zip
Make cups mandatory, bug 478364
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice-bin/ChangeLog6
-rw-r--r--app-office/libreoffice-bin/libreoffice-bin-4.0.4.2.ebuild9
2 files changed, 8 insertions, 7 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index 078792370739..0196dbc87003 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.109 2013/07/20 22:12:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.110 2013/07/27 17:41:49 dilfridge Exp $
+
+ 27 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+ libreoffice-bin-4.0.4.2.ebuild:
+ Make cups mandatory, bug 478364
*libreoffice-bin-4.0.4.2 (20 Jul 2013)
diff --git a/app-office/libreoffice-bin/libreoffice-bin-4.0.4.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-4.0.4.2.ebuild
index a9fd54990e53..f96bac7658dd 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-4.0.4.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-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-bin/libreoffice-bin-4.0.4.2.ebuild,v 1.1 2013/07/20 22:12:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.0.4.2.ebuild,v 1.2 2013/07/27 17:41:49 dilfridge Exp $
EAPI=5
@@ -51,7 +51,7 @@ SRC_URI="
x86? ( ${SRC_URI_X86} )
"
-IUSE="+cups debug gnome java kde"
+IUSE="debug gnome java kde"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
@@ -112,7 +112,7 @@ COMMON_DEPEND="
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
- cups? ( net-print/cups )
+ net-print/cups
>=dev-libs/dbus-glib-0.92
gnome? ( gnome-extra/evolution-data-server )
gnome? ( gnome-base/gconf:2 )
@@ -192,9 +192,6 @@ 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 && ! 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 || \
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
}