Update required use. drop the gtk/qt/gnome check and add eds requiring gnome.

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64
RepoMan-Options: --force

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 5380bdc6f0d55c0411028147f28dd6d008002fde..e215312815ae705ed927d7d971bae047a0b1549f 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.194 2011/11/09 19:08:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.195 2011/11/10 12:28:02 scarabeus Exp $
+
+  10 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.4.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild,
+  libreoffice-9999-r1.ebuild:
+  Update required use. drop the gtk/qt/gnome check and add eds requiring gnome.
 
   09 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   -libreoffice-3.4.4.2.ebuild, +libreoffice-3.4.4.2-r1.ebuild,

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 186deaed3e12b99f665c2703ae7f6c534905a2c2..1ae2ce411217f3e24aba181cc4c8b14a202e53ed 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -173,25 +173,25 @@ DIST libreoffice-writer-3.4.4.2.tar.bz2 7296517 RMD160 0ea8e99afe53c3ad81148562f
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.4.ebuild 18254 RMD160 f8ccfefe0f1663982a07f9468db62cd8be2e98f9 SHA1 76ee2d703a045fe306a119f7c750d5f1633a240e SHA256 4d723c31545c807a77b3b24199b566bcec50f4784a5a767ef021a13f5843d1f1
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 08657e1067a7769b11aa1a095a9e755a478f9a24 SHA1 035c05abc1ccc7fd3834ebc0150103be35bec5eb SHA256 4265eb3af09948f4145550f372ad3d632ca36472ec461aa93d2fcbea4a27d242
-EBUILD libreoffice-3.4.4.2-r1.ebuild 16543 RMD160 bb0ae45b2ae5b5842ff6c0448422a6775a126966 SHA1 f8f9a04d14a79da20160cf7d42c9f8d2b460208f SHA256 221aa5fa172801161fb79afe45bdaa9e1738f9c71e21f79c660129f96b8559ea
-EBUILD libreoffice-3.4.9999-r1.ebuild 16567 RMD160 979ce45e6e9eef74fa9e109ae2724dd34d923340 SHA1 8f9353ef98f51a3b92ab21d491762f2a01878639 SHA256 4bd3948d60626dc6c12c79165510a5f7ff4b077ca20bfac336f8d09ee3fb54d2
-EBUILD libreoffice-9999-r1.ebuild 14910 RMD160 12289d54503e99c4e7fa48ef480be8bc15c78737 SHA1 fced198e91e245a5e5c7395d34a87e32d29132c0 SHA256 87cc4085bd525047a0e98f43a3398118cf454856dfae320e34302a97ea98f32d
-MISC ChangeLog 35768 RMD160 3ac74856dd5b8dc940a63e2366c2657fbdb428a3 SHA1 dab875d6ea084bc10a041a851128e8646e8aee5d SHA256 b6d66044822f961f2641d7922ef187be8bb6e2da15df3084c2bec160451dc7be
+EBUILD libreoffice-3.4.4.2-r1.ebuild 16537 RMD160 859a610da9e697a9e5b7832108f3f57dc9145d33 SHA1 0be702423727887cb1b42b3157766c0235fa03b5 SHA256 fe8abb5d7a09586e76f5181064f0d88ad91814db459084b332adbff4e80694d8
+EBUILD libreoffice-3.4.9999-r1.ebuild 16561 RMD160 d29d090c711bfd6b4cfc6ecfdb7c410c0e0df0d4 SHA1 1df0d0fc1912e9763d51494e0da2032a0ce4d2d1 SHA256 e4fab488961d4691bcfdab124c642f1bd99c030ea8dda87d2637e5edbb5f5407
+EBUILD libreoffice-9999-r1.ebuild 14904 RMD160 20a571e87b6032b5b61223ec946edbaaa7f545b2 SHA1 2c0647f6ee8f2a69150f5982e46e7d63643a8e25 SHA256 c9d717a76e477c64977060387faf9d659664cf7539c4ce07202478d68d769aaf
+MISC ChangeLog 35999 RMD160 3f5f47c9f03f159a532eaae8e41c311aa987d84c SHA1 79dcc746330cb4f69135974554fce8b7fff39f4c SHA256 1308c8e8f3ae68a8fca715cbb38543d74b1918b03b10c2d795d39757d048f377
 MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOus+vAAoJEOSiRoyO7jvoK2sP/jNsZjodq5Tb4drQkRDVcLsL
-dX/2L2Sw5Tn3TFVP/fcvJhX319csK/U0pGPntivT+Icge0t4Ts80sCIaoLhN3ao+
-cESUbArwZgPV0ew8nQ/x+CpAe6T7CcYUrqqJprDrPEnBzWH410djwzGnLcvwN7hg
-Qr7tav43dXEcV3eqLlC3eKAFa2vWsT4J/M78wiVLjlWSPyafXPD0IDo0StVRt/T3
-XiuHMJyQWGWONb1ARvcvHXQos2+S3TB/ReIizOghN3ZMW2nWvnCyYcGnig7Y+VKd
-UhXJ8T9+7xNyXZemArSFsTG0KUB3+j9GtDxeo/ac29xzEJotsYb+yqsAL0Lc4wM8
-X3Aapvg0XFBEz55tEsHwpWKkE6PFIlHvBLh/Uo7czWnZ2I38sA2iItYRZBVhBhyJ
-x9LbRHy0OMEH6aGnRdi6vzA9sseQ+Lkouvgv/xVahmz+382i4+K8yEfS4476IJaI
-CGEhH3erWvJrrqmvEBqQ1JChXte8takOseXEDKk4VDbKDuOmTa8Pe4k+acfTmuP+
-T1S0SMId7Os0U+caxagi2Ru6R4G3sN5b1ukhamNInjwlhCRUxDB8Xi269zh1B0/t
-XCQfxIYoNgZEpA/BxiGDIcRM3irsa7L/VGVsnXOb2fjxHpbrrF9fkT0lrtF4rC9b
-POZezJRUamXSfLxSlfMT
-=piR1
+iQIcBAEBAgAGBQJOu8NNAAoJEOSiRoyO7jvowqkQALKf+1Yo5qiHPj1GoMQdLtjd
+xW/73fu7E1mm+KcdU2srJWdcT18dog9SuEh5IzWE8Pjg1snNuMErqtNMj1SVHkK4
+fTg5nnB+JCpuuzzPZENAdht41LN5CQAj5WPlCC3PMfseUv25syAKtyzbZmGuqRtB
+qOKEmxzIbGmOIiXsmhQTEgKWCOqtQeHu+W9z/ZxtK/3ATfLmVYR5XqJ1zp99sjps
+4QE6iFetwPSVBnkXTiSixWLzN/8Yc+ktKfIUnmRT+HTIS51wisRGMkv4V3wAf8S7
+Nhd5GrvqY3KcBrRduo548CEcox0LpfBleGnZmLURTb6ICdkOYgacBaKe8VtQmd5u
+KV0A1UXL3deSz7H0a3IjJWa9oK2WPaQk1dJr4irTSul3EgkCo5lZjzkWHi0WiclK
+R7mqUo+neFIJlYHjn6wI4IA5gI5SKiQVYc/3YSkyj4ZFDdZOwIE/gR9GMTi7YCUg
+TpI6RUkWShDIG7s5M+Pzl0v076Iz13i0YDZQuMJVULPrJCjEVRM0gC/gCDiarSPa
+BzLpKnU07iW3C+s5YIjkqxn849g8VJhkdcZnCPSnqth/Oe0IkrzR8GRk1EpGiVIf
+DloihKQ6+A7yM74zMpalP4uc/e0eMR9lnGa9h99+eAiFCZxJMWS0SbKYh9f6Bkjv
+lbeox7tn03aMlYyuzDZV
+=2Gtg
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild
index 7350a008c7fd1c8d9c03a27045897a00cf914126..197cd7518bf996a65b9612aef141cf82aa04a493 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.4.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.4.2-r1.ebuild,v 1.1 2011/11/09 19:08:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild,v 1.2 2011/11/10 12:28:02 scarabeus Exp $
 
 EAPI=4
 
@@ -211,9 +211,9 @@ PATCHES=(
 )
 
 REQUIRED_USE="
-       || ( gtk gnome kde )
        gnome? ( gtk )
        nsplugin? ( gtk )
+       eds? ( gnome )
 "
 
 # Needs lots and lots of work and compiling

diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index 2f51007358305e538ccde439f40bca962e185cab..0458ef1eb1d17a0005166e15fbab1bc056663420 100644 (file)
--- 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.20 2011/11/09 19:08:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.21 2011/11/10 12:28:02 scarabeus Exp $
 
 EAPI=4
 
@@ -211,9 +211,9 @@ PATCHES=(
 )
 
 REQUIRED_USE="
-       || ( gtk gnome kde )
        gnome? ( gtk )
        nsplugin? ( gtk )
+       eds? ( gnome )
 "
 
 # Needs lots and lots of work and compiling

diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index 9a3d6b88291dd7a8b955f70145814be41bf6697d..229a58cee3d271dd8613a0ac1d45cd6863683727 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.56 2011/11/09 19:08:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.57 2011/11/10 12:28:02 scarabeus Exp $
 
 EAPI=4
 
@@ -209,8 +209,8 @@ PATCHES=(
 )
 
 REQUIRED_USE="
-       || ( gtk gnome kde )
        gnome? ( gtk )
+       eds? ( gnome )
 "
 
 S="${WORKDIR}/${PN}-core-${PV}"