Make cups harddep to solve build system issues. Also harddep for 3.5 and later anyway.

(Portage version: 2.2.0_alpha53/cvs/Linux x86_64)

4 files changed, 18 insertions, 12 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 100d26f5f113..e44541ce3385 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.123 2011/09/04 09:24:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.124 2011/09/04 11:52:14 scarabeus Exp $
+
+  04 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild,
+  libreoffice-9999-r1.ebuild:
+  Make cups harddep to solve build system issues. Also harddep for 3.5 and
+  later anyway.
 
   04 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild,
diff --git a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
index e495b1dc8c8b..329d861ab6b3 100644
--- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.2 2011/09/04 09:24:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.3 2011/09/04 11:52:14 scarabeus Exp $
 
 EAPI=3
 
@@ -100,7 +100,7 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter +branding cups custom-cflags dbus debug eds gnome graphite
+IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
 gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba
 webdav"
 LICENSE="LGPL-3"
@@ -135,6 +135,7 @@ COMMON_DEPEND="
 	>=media-libs/fontconfig-2.3.0
 	>=media-libs/vigra-1.7
 	>=media-libs/libpng-1.4
+	net-print/cups
 	sci-mathematics/lpsolve
 	>=sys-libs/db-4.8
 	virtual/jpeg
@@ -143,7 +144,6 @@ COMMON_DEPEND="
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	cups? ( net-print/cups )
 	dbus? ( >=dev-libs/dbus-glib-0.94 )
 	eds? ( gnome-extra/evolution-data-server )
 	gnome? ( gnome-base/gconf:2 )
@@ -449,6 +449,7 @@ src_configure() {
 		--with-system-db \
 		--with-system-dicts \
 		--enable-cairo \
+		--enable-cups \
 		--enable-fontconfig \
 		--enable-largefile \
 		--enable-randr \
@@ -491,7 +492,6 @@ src_configure() {
 		--without-stlport \
 		--without-helppack-integration \
 		$(use_enable binfilter) \
-		$(use_enable cups) \
 		$(use_enable dbus) \
 		$(use_enable debug crashdump) \
 		$(use_enable eds evolution2) \
diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index 41b732ea35c9..14dd4fc68487 100644
--- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.2 2011/09/04 09:24:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.3 2011/09/04 11:52:14 scarabeus Exp $
 
 EAPI=3
 
@@ -100,7 +100,7 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter +branding cups custom-cflags dbus debug eds gnome graphite
+IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
 gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba
 webdav"
 LICENSE="LGPL-3"
@@ -135,6 +135,7 @@ COMMON_DEPEND="
 	>=media-libs/fontconfig-2.3.0
 	>=media-libs/vigra-1.7
 	>=media-libs/libpng-1.4
+	net-print/cups
 	sci-mathematics/lpsolve
 	>=sys-libs/db-4.8
 	virtual/jpeg
@@ -143,7 +144,6 @@ COMMON_DEPEND="
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	cups? ( net-print/cups )
 	dbus? ( >=dev-libs/dbus-glib-0.94 )
 	eds? ( gnome-extra/evolution-data-server )
 	gnome? ( gnome-base/gconf:2 )
@@ -178,7 +178,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PDEPEND="
-    >=app-office/libreoffice-l10n-$(get_version_component_range 1-2)
+	>=app-office/libreoffice-l10n-$(get_version_component_range 1-2)
 "
 
 DEPEND="${COMMON_DEPEND}
@@ -449,6 +449,7 @@ src_configure() {
 		--with-system-db \
 		--with-system-dicts \
 		--enable-cairo \
+		--enable-cups \
 		--enable-fontconfig \
 		--enable-largefile \
 		--enable-randr \
@@ -491,7 +492,6 @@ src_configure() {
 		--without-stlport \
 		--without-helppack-integration \
 		$(use_enable binfilter) \
-		$(use_enable cups) \
 		$(use_enable dbus) \
 		$(use_enable debug crashdump) \
 		$(use_enable eds evolution2) \
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index 07e51915ad02..f86db839d3c9 100644
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.2 2011/09/04 09:24:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.3 2011/09/04 11:52:14 scarabeus Exp $
 
 EAPI=3
 
@@ -178,7 +178,7 @@ RDEPEND="${COMMON_DEPEND}
 
 # FIXME: l10n after release/branching
 PDEPEND="
-    >=app-office/libreoffice-l10n-3.4
+	>=app-office/libreoffice-l10n-3.4
 "
 
 DEPEND="${COMMON_DEPEND}