Punt openoffice as it is gone from main tree for now.

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

diff --git a/virtual/ooo/ChangeLog b/virtual/ooo/ChangeLog
index 0748a8a72bebb56cbba1aa92d26440120e99dfd9..7225d40748a13754a8bd0e0d1516c3230d6b4645 100644 (file)
--- a/virtual/ooo/ChangeLog
+++ b/virtual/ooo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for virtual/ooo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ooo/ChangeLog,v 1.2 2011/07/28 16:49:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ooo/ChangeLog,v 1.3 2011/09/02 10:20:40 scarabeus Exp $
+
+  02 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> ooo-0.ebuild:
+  Punt openoffice as it is gone from main tree for now.
 
   28 Jul 2011; Michael Sterrett <mr_bones_@gentoo.org> ooo-0.ebuild:
   sparc doesn't have openoffice at all

diff --git a/virtual/ooo/Manifest b/virtual/ooo/Manifest
index d13dbff6befa007db1e2e7eefaa46dd2171fa1b9..3f059f602c5f69773506651c384b05b1660ad66a 100644 (file)
--- a/virtual/ooo/Manifest
+++ b/virtual/ooo/Manifest
@@ -1,3 +1,13 @@
-EBUILD ooo-0.ebuild 479 RMD160 642706defb01729faabff4b3cae0ced95a13c2d7 SHA1 dece355a823289109ce63a5791961a864bf356f5 SHA256 7764894cdf2fde959f253fc364271ec456ee1eebadc36ef93759e091fd0a504a
-MISC ChangeLog 449 RMD160 22f9f17a6f2675ede727443029ab2c963911a297 SHA1 f5d7bc38215839ef5ec06df8b44fda3d06bdae5b SHA256 fdfb901aca0e0503263c8734a276347b1425be42b54befd02acee6ade01163d3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD ooo-0.ebuild 434 RMD160 db39fbac470a68404e5f32b4da5bb558568c5f79 SHA1 9e1661e462248bd6cf9d1b70cd6b188e01ad0d24 SHA256 21ae7d31f5d140ea9e08de5872f2608eea00c2694c9ffac54d61f9022196fea4
+MISC ChangeLog 575 RMD160 ae9107eb5615d06615d9f6a618c1cb6205fceb3c SHA1 30c3ca82e9fa9f0e0fe6070d6cfac762969b7523 SHA256 faf020cf0b392cf020dafac358f19773b94aaf275911681d6c1c856648192d60
 MISC metadata.xml 163 RMD160 68888b3756b2cf14b88ff5aa31e4fd07c9cc9713 SHA1 bd3e6fae69f40f453bc382ae8f1a7644a590a9cc SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5grgYACgkQHB6c3gNBRYfH0QCfdwrp0XVJdINcAt2YWvlBA+5Q
+nU8AniLvZYRSBWarNAeRqSVV4UVuFibF
+=VVAd
+-----END PGP SIGNATURE-----

diff --git a/virtual/ooo/ooo-0.ebuild b/virtual/ooo/ooo-0.ebuild
index 26a006832f4de7e7d1d6416d94d928cdd5a197b1..8c990d2fb6f976c8b786fe0e5b39984f99deb5f6 100644 (file)
--- a/virtual/ooo/ooo-0.ebuild
+++ b/virtual/ooo/ooo-0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ooo/ooo-0.ebuild,v 1.4 2011/07/28 16:49:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ooo/ooo-0.ebuild,v 1.5 2011/09/02 10:20:40 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
 DESCRIPTION="Virtual for OpenOffice.org/LibreOffice"
 HOMEPAGE=""
@@ -14,9 +14,9 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| (
-       app-office/libreoffice-bin
-       app-office/libreoffice
-       app-office/openoffice-bin
-       app-office/openoffice
-       )"
+RDEPEND="
+       || (
+               app-office/libreoffice-bin
+               app-office/libreoffice
+       )
+"