Cmis upgraded to be harddep.

Package-Manager: portage-2.2.0_alpha62/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index d2f5faf80a977bb5b56ca3c2018480d7b386ac4f..0f674a62d94ed5278b8a1e00c73f13dc34ab6f83 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.166 2011/10/05 09:25:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.167 2011/10/06 14:20:05 scarabeus Exp $
+
+  06 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-9999-r1.ebuild:
+  Cmis upgraded to be harddep.
 
   05 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-9999-r1.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d3f7c6b76c0ff71f50877d2646b96bd56e68e0dc..37d311fd78ead29b90b9beaadb9ae4b820d91faf 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -175,23 +175,23 @@ EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c0
 EBUILD libreoffice-3.3.4.ebuild 18143 RMD160 567f3a8d7b2267220770f600b893d13028db6f26 SHA1 f525de7d3ea068f38ae62a6887d0e0aadf651592 SHA256 4e7131a8fa14b4224068a21473093a16447086d0d9e390ad74faaffc72ec8ff1
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18436 RMD160 b191fa9979d6dbdaa1bcd28e2c6d2f9032bbc1e3 SHA1 8257e6ccadccce2be69f4b505434b6797acb069a SHA256 db88c53de529b6375dc88e0d80a20fb9e60c6662141ef0a6671cfb266c4b67c7
 EBUILD libreoffice-3.4.9999-r1.ebuild 16232 RMD160 c231738d7bddf6864506de2340e689741516de06 SHA1 c1088425b7f4e05d206c9fb82852cab485d3023b SHA256 854be998206ea97ad425a41e2b287aa4e4f9c4bcf2da8b39bf5e5e0688d6fb18
-EBUILD libreoffice-9999-r1.ebuild 14425 RMD160 f1e30be282873964af902a9de2757400d1af1521 SHA1 c8d1b84de95aca6d571354f0ce30c58d196288f3 SHA256 759e062989a7932dda045c03bc0a71d19ee034810feee7b532610231251d2493
-MISC ChangeLog 30822 RMD160 ddd7ba749f7d210e4b38854141ca6c0d97f40c5a SHA1 cb4072bdca5bc8a8440af69db4da6bfbd3c445eb SHA256 0b56f315b1dfc837fcebc443528457048b714341cb95c8d6799820e7b6448b8a
+EBUILD libreoffice-9999-r1.ebuild 14388 RMD160 b650dc5c06735684d81a3a9d71147adc5fe7a822 SHA1 0e93b26a95a9f3511f93ee21204dd364b349c4b3 SHA256 3ddc5f3c6ebc2284e3a3fdaeed77e395619c7d50a0574d64f0a8037136378fb5
+MISC ChangeLog 30939 RMD160 db0a89c7ed15415ad7f8c0250af1694412b06c67 SHA1 559de8536b57adaf5ae3635c0cf0d813a69e6d57 SHA256 eeeda06adec1c64ea24020ff2c01aec9e2480344aa3e63e25be07fd32d743e76
 MISC metadata.xml 1288 RMD160 c6b52caaa3e75c7397e6861118161c8a1fc5c71b SHA1 853447f772970ae4fadd8946514ca8e5fdd2c94c SHA256 be7565ef5c1d68c3d1403d267adde287588d51145da8f374ee247ee5549f8a9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOjGjYAAoJEOSiRoyO7jvoOzQP/jUg78uQgOt9BeQj66/XB1pT
-fWLfS9Rp4KPgbS/QUiQqt46vDXPItV7rUAS6zt3TkQbiuV1aoxQpAI1HV9OhthCt
-2oHAeg7Kv2s1K+mBNOWy42XB3ktYOYPTrRL51b99UfLNrj4YSEohNCTfDQOOISM5
-hG/OK97nHbhLjexholMm6y0BCfTOkG8mbaA17al1QKo6QD+4jvj0FLelQQkYLTtP
-/XqLtaEVkT+vtpFFec5/GBevLf07bMneDhg+VkB3XgYzrFC7sAU/epm4p7tCbK42
-/zkBaeFgV6LnvnlX2OUX2SfeJztAhDJaytQoSt9r6cy8xwZumdmgKFW2fbdGRQUu
-MP6qyZref4Wkbly16Qk8FjAHdfP7gpW0063CBdXrofpgQvA3j1DXynmrTCLGrQc5
-TxjFiVnf2WOOx4aGwgRJONViNPU0iOwGkKj+So9sQ/vqfg4JxXFoopxHAjDnHyuB
-7CIerzQ+Ygx5K09CUmmPpjEkrXmEAC4RpM9e9ehqCzw40FJHoj4Pl2K8xxBDRgzn
-Br0zpl7cPEX2Lb+2q2dVvcIy29WFw9Zo/ZrnauRjaPPeZVCHM5g4rYf/i+7cCBbc
-RJgHInT40AgV/Mf+gPVVwDeJty/rXN9y9yHdZYXQE2Qw/pMt/pezF6NEZe2aDEgM
-+aDGXde/LWOX85gXhAhY
-=I2nJ
+iQIcBAEBAgAGBQJOjbk/AAoJEOSiRoyO7jvo/P4QAKgjaLcD6uY892h0VMRiuYNG
+dFwX3dsx/3JovTYPdHh11SrWLskej0P3RovW8PHYgY3uoVsUPSKSNRzT3vp+ygTj
+roGDfbmKkhoDEvrnemyjp40C7UTiho/qdeRVMQTqc9ZqA9HoT8KVOZBj3WzZY/+k
+fSIldb/ae4fQMgcXf1mKVNdKIZHPGIAVM7mDGWrptUhVug6iwRqcsD3EycU4twbT
+oLOlo/zQoAprrPOk9ntCdI5X7chKCxhuZpW7mUQ7QAHPoIGoFnxTf/kDsF+fZ2Mk
+zRdfAjjBiweOwJs+Klab4LhnVb4MnQeec+5fwI1seY6c0h2lz8BPclO0YuegVrAa
+9s9PFlExTSHw41hpKc0rLRo1FnYSIYKBI0LW6UmtvDcFkOi2ZPgA7KnDPDAje76f
+aE8mwc6eZn7Nm+F9iu7P0rPaudc3vwAXXsA8rqQ8hePWI8CynGXJ5XETps98Z7Lw
+yFusu4NpIH5egZybDHSajUzcVQv2SrAmD9f3KX3ruV2uAkP5lvX2xlHp4q5N6rR/
+VF247YYszHUUNCARAyiSAxqplo5kqxtoEEN4Lv3UTev7z+z3UGVl+90oyAFy3/bI
+jd6C9fhS2bJRXVzD9zZLQV0r2jEkjow3sOJA7UiMZmz3ZirZKkPaI0xRWi6PdwiE
+udFIdQYo0ay4XKe0ro/j
+=JnWC
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index 9f94116cb93e72faf5eb87848b897e054adc0cf9..16e50a3e1569248c475e7b6b78a7da3f85b2db16 100644 (file)
--- 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.38 2011/10/05 14:25:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.39 2011/10/06 14:20:05 scarabeus Exp $
 
 EAPI=3
 
@@ -75,7 +75,7 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter +branding +cmis dbus debug eds gnome +graphite gstreamer gtk
+IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer gtk
 +jemalloc kde ldap mysql nsplugin odk opengl pdfimport svg templates test +vba
 +webdav"
 LICENSE="LGPL-3"
@@ -98,6 +98,7 @@ COMMON_DEPEND="
        app-text/libwpd:0.9[tools]
        app-text/libwpg:0.2
        >=app-text/libwps-0.2.2
+       dev-cpp/libcmis
        dev-db/unixODBC
        dev-libs/expat
        >=dev-libs/glib-2.18
@@ -119,7 +120,6 @@ COMMON_DEPEND="
        x11-libs/libXinerama
        x11-libs/libXrandr
        x11-libs/libXrender
-       cmis? ( dev-cpp/libcmis )
        dbus? ( >=dev-libs/dbus-glib-0.94 )
        eds? ( gnome-extra/evolution-data-server )
        gnome? ( gnome-base/gconf:2 )
@@ -437,7 +437,6 @@ src_configure() {
                $(use_enable vba) \
                $(use_enable vba activex-component) \
                $(use_enable webdav neon) \
-               $(use_with cmis) \
                $(use_with java) \
                $(use_with ldap openldap) \
                $(use_with mysql system-mysql-cppconn) \