Cups is harddep starting from 3.5.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64 OpenSUSE - Tumbleweed

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 178b04d9792dacddc78ed8cf246871a7e2a17820..4dd8534997e0e5af48f1cf31ac010129a2954f64 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,9 @@
 # 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.114 2011/08/19 12:40:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.115 2011/08/23 11:07:51 scarabeus Exp $
+
+  23 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999.ebuild:
+  Cups is harddep starting from 3.5.
 
   19 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.3.ebuild, libreoffice-3.4.3.1.ebuild,

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 73715b78d72c66fa2701370908848c8d879e6bbb..29a75d125478a6b918eef0022087acfa15570373 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -192,6 +192,6 @@ EBUILD libreoffice-3.3.4.ebuild 18141 RMD160 50ac48e5cc3206f2cfc35c69a098fba8e38
 EBUILD libreoffice-3.4.2.3.ebuild 19702 RMD160 d227cd67ccaa56da97ff90fafd05518ce2f41175 SHA1 6e1e5473f92e677660b6e861aaa15c4141348ec9 SHA256 55b8d237745e825b3cedae134ea7a44e51849447129b0e78ce291f727ee69f33
 EBUILD libreoffice-3.4.3.1.ebuild 19627 RMD160 beaf02a3d6cd67cdcecd1e3321b22eec0dbeb112 SHA1 af78bff03004937064a745bc1b1a8293523a639e SHA256 3b82079f9607a7e88ba245b0f2304f58786eb312bb1e912f6e029e1566718824
 EBUILD libreoffice-3.4.9999.ebuild 19586 RMD160 4662503dfd2b12af541846d1a239cc9bc7193c56 SHA1 c656bd5904fa27b366462d8f79a021c05fa673ef SHA256 8e9092539648893e22838b2c9d51377b70427909e1a1d4f032db98f0838dd582
-EBUILD libreoffice-9999.ebuild 18956 RMD160 4dd6e3cd33eb4c7fc009e988ede1049f52eb41ee SHA1 1a932d2ea4cc48c933e347b965d9639556619ae1 SHA256 29190cc0584adbd9c3801b047bec160a7d40d9bc39a4999dfeb9e101ff91193f
-MISC ChangeLog 22253 RMD160 e68d6a6e15427e849e315242957eba95a4e66bd8 SHA1 8df029bea24cf3e36330d4f91b8d3d543314a580 SHA256 587aa72133e34bae5d461d6520b0d0ba63f35c15813a51b0e8660c4ab0410c0a
+EBUILD libreoffice-9999.ebuild 18918 RMD160 4d75dfa59d2cc49ec004735edc50bbbd3d1dbd09 SHA1 650cfbed2612526cb8621c3798e74ab2d2faf473 SHA256 7b59e5165db4b390808eb4737995209f61b92a653b4031d4a831f1f3197a76c8
+MISC ChangeLog 22371 RMD160 c7de02d52304ae1a2880cd522cc1ece6e31f3a7f SHA1 8f35db96ce3ec083d0c6c389e19d07781345d592 SHA256 646d01f705fbccf1c8dff4b047c7c257144584dc32133c8d96af0c858b34976b
 MISC metadata.xml 1081 RMD160 df0ee3e614054cbd5f850530a17c0958b81a5d19 SHA1 8fc6d58e473f009d55a8876dc77135c0234d943b SHA256 2c90f32341f47586996dce605e83037a6759854a2871b8396f9832cb64f4db19

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 341a2574d0fda9cdd7fd1d8bfb454d6efdb23211..b92ac4e2474546bd9711b898645dfd5117975043 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.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.ebuild,v 1.17 2011/08/19 09:56:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.18 2011/08/23 11:07:51 scarabeus Exp $
 
 EAPI=3
 
@@ -106,7 +106,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 offlinehelp opengl svg templates
 test +vba webdav"
 LICENSE="LGPL-3"
@@ -147,6 +147,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
@@ -154,7 +155,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 )
@@ -506,7 +506,6 @@ src_configure() {
                --without-ppds \
                --without-stlport \
                $(use_enable binfilter) \
-               $(use_enable cups) \
                $(use_enable dbus) \
                $(use_enable debug crashdump) \
                $(use_enable eds evolution2) \