Dictionaries and help is not used in our ebuild so punt it.

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 2292a23678bd53c7ebd555f64cce242755feacb2..dc97067a5cb3f4f7d90f51b2f6c067a7d86bb711 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.192 2011/11/08 11:03:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.193 2011/11/09 10:12:48 scarabeus Exp $
+
+  09 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-9999-r1.ebuild:
+  Dictionaries and help is not used in our ebuild so punt it.
 
   08 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-9999-r1.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ae86b2abe10cee70920342e157f227f5b32e2442..5994927a2d4960a9e1f138a888c1dd08b8dee49f 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -174,23 +174,23 @@ EBUILD libreoffice-3.3.4.ebuild 18254 RMD160 f8ccfefe0f1663982a07f9468db62cd8be2
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 08657e1067a7769b11aa1a095a9e755a478f9a24 SHA1 035c05abc1ccc7fd3834ebc0150103be35bec5eb SHA256 4265eb3af09948f4145550f372ad3d632ca36472ec461aa93d2fcbea4a27d242
 EBUILD libreoffice-3.4.4.2.ebuild 16230 RMD160 e9dee95e4c013d38e0ed97e94837679402918494 SHA1 235a45abfcd1dca5ffc3dea94366bcfa7294858e SHA256 0af9ab7b728b6f781648c0174fdf8e3f7512db853e114d628ba4f6e4576b40f9
 EBUILD libreoffice-3.4.9999-r1.ebuild 16235 RMD160 760cac63fb0d1689889becfbd2a205459f435ed3 SHA1 2557f8a9cfb15042c79c915c08b33e8fced3de08 SHA256 10dc12813968fd9fd8b0ffaadc46b8ef1012c3c4eaa55d09fdc05727c2a390eb
-EBUILD libreoffice-9999-r1.ebuild 14577 RMD160 d346282d8da690cd7563750a06051773254021f4 SHA1 b81f525d891660d35cab34b69de24f56690277e4 SHA256 32d56a7fa4f0b5ebb85329a7494bc265f7dc3600ed3295814d8776bea7629f47
-MISC ChangeLog 35021 RMD160 8a6fb5def98e48d70e0ab8b1776b163b4b403b1c SHA1 d59e47203fa38f906f4621f7b183dce266544e26 SHA256 ece8cbdc3f3494f1059db07b5c5bd836428f51a38d300dd0df32e3e5f499abc6
+EBUILD libreoffice-9999-r1.ebuild 14578 RMD160 e706a18c7f09f4075ce5e6974020693b3b70d031 SHA1 cb4ede748ffcb141a0d79ab4c4a94cc7b1053ba0 SHA256 6f5c7922ab4a5c562a1665d8b73c390ef3bfeaaac42687ed1183ffd5e4f66f23
+MISC ChangeLog 35169 RMD160 a708f6ad3651c24d4e47ab3956f3b618d59459da SHA1 c805682956f553eb20ad4b0fadf0567b6a1b8e83 SHA256 c048434aa1a8d7811cfdc08888bb7c23b0d1803698d9e5fab2132370c8c61b71
 MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOuQySAAoJEOSiRoyO7jvog/0P/iI7rCaOllUE63S0zkJA4C2K
-eohfzaak73mkGO0Pz/D17UIOgF27tyVdiB0iXpNsRxX4FRG9Nt1a49CddUvef4SG
-vdHgTB370x1hKznXZlZtM/SWAEn1FLQDB3Cnuyn/6TrqecWmMO7+MZjXwSR8g1Vo
-iCvzDydxrh+/0/0bxL3Pn3vrNk0RnZ/9xUKjGyynbtcGSaSwLGzPpnSYxBD0G4ee
-bLT+KooGyIKW0QJ3Hu2dPIkBNOOfxT4EIUC1AbcQNnMm1OtWLTghFp4to8LuMqzG
-H8Y5+GwDOjUZOc3nb6UvIf5t3pSvhHPUnwLy/2d4PSUQ/BiRGdZCkjd64VAMtF5Y
-FaVBnMBpzEa8K+y2MasQPx7UZIIje+HvtDH7WxQZpQ8Egqmh1sBYX9QF+tULtXxq
-IiUcfVI3m9mQdHJwsXb3jMYEJ2gOvW3Mtz91mVLMknL49uHhXoU3Ld50qdR6XAs5
-VsHWRmPpWOlLR98HMFHSJ4KplBXNnSPS+tZsOX6meW+nejzeLit47l/qp+W+X+nZ
-qLbJ3+jk68BwgFe4Wi5AzERxOr2+gLAAubeqV1cCCEoRXgvD/2vye10JxMgWDVgd
-yhTjbGNET/zXZ5AIAqSVxpsYhbD6SIjAMBw8EguHJRiPhTI0T8BEmN0F9NDa0ihv
-zo3ux39KGhsd7jP8lCh9
-=2iyh
+iQIcBAEBAgAGBQJOulIcAAoJEOSiRoyO7jvoJOoQAIWSUch1It4pgVta4GgaThd7
+uFTguhQ50G2ID7zyOmhebETXi/TRHoIUxBWizqoIQQG6ecBw9G7WZhr5NcGGSpQG
+HYMgslS3ljBwYAFwiudgnFsTT+6qSHsguO8Dfcl24ImUusro+XgDsaS1M6v6p3GA
+ulZ0pSpiM93/rHajp2S98+roNJ9zwxtsCBbgiSc/V2YUhjU+cx17Ad+Ji3a7TFk6
+l8k7BpBUWOLd9fyewM8FKL9IqVUxXOKWjczH4NhsoC7hCa93TAehD6tfIjKOmJ4a
+/J+DbQahmMxst8hf4WFX4jxhvFY69Xa1xnvLLitHHripfsYYwqvEHSZh66aTImiR
+vXzoZL+wQmVEtdZn8aJlCyrNbKi1f61D7+on/TkkmQEkaWZD/8C3VTaSXdMMKpep
+5wGougIADkxBNk+mIbnvnHZpF5xXgGKIpW25ZRFI5amDYLL+F/dMOiT8YwzILZbJ
++srqZQrr03hluuTE+2w+4CP95HXdyMTD3G+5Wwa75yem/IKGBaiXclEn/JYMV7UR
+1XnhrNHfcaN0QxOtxv5WuT0iwVX28gWSltdMyRk2WwakjBDhnOmhUZKBeQAciDDj
+yIiX3WxSAcri37BrWgYNeQ7pKGgRJ+fIpfx3ATHUi2dR8b9l7yC701xMJcLVyIER
+bZBnFRWqc70o1YWeDu5V
+=49yS
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index c3d1be89812102adcc23ad53c6a3a9ec00404f86..b5c1a9dbc4cf243b9f471043d6a5eb765625ef16 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.54 2011/11/08 11:03:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.55 2011/11/09 10:12:48 scarabeus Exp $
 
 EAPI=4
 
@@ -34,7 +34,7 @@ SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
 
 # Split modules following git/tarballs
 # Core MUST be first!
-MODULES="core binfilter dictionaries help"
+MODULES="core binfilter"
 # Only release has the tarballs
 if [[ ${PV} != *9999* ]]; then
        for i in ${DEV_URI}; do
@@ -425,6 +425,7 @@ src_configure() {
                --without-ppds \
                --without-stlport \
                --without-system-mozilla \
+               --without-help \
                --without-helppack-integration \
                $(use_enable binfilter) \
                $(use_enable dbus) \