summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-04-07 15:19:36 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-04-07 15:19:36 +0000
commitda7b4e4069ef360a1820b38a595a519110604d77 (patch)
treeff05fb92a95245594060d994ce5f93994b678d6c /virtual/ooo
parentVersion bump. (diff)
downloadhistorical-da7b4e4069ef360a1820b38a595a519110604d77.tar.gz
historical-da7b4e4069ef360a1820b38a595a519110604d77.tar.bz2
historical-da7b4e4069ef360a1820b38a595a519110604d77.zip
Add use for java wrt deps on extensions, preffer source build over the binary.
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
Diffstat (limited to 'virtual/ooo')
-rw-r--r--virtual/ooo/ChangeLog7
-rw-r--r--virtual/ooo/Manifest22
-rw-r--r--virtual/ooo/ooo-0.ebuild10
3 files changed, 26 insertions, 13 deletions
diff --git a/virtual/ooo/ChangeLog b/virtual/ooo/ChangeLog
index 7225d40748a1..02d6aa04271f 100644
--- 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.3 2011/09/02 10:20:40 scarabeus Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/ooo/ChangeLog,v 1.4 2012/04/07 15:19:36 scarabeus Exp $
+
+ 07 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> ooo-0.ebuild:
+ Add use for java wrt deps on extensions, preffer source build over the binary.
02 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> ooo-0.ebuild:
Punt openoffice as it is gone from main tree for now.
diff --git a/virtual/ooo/Manifest b/virtual/ooo/Manifest
index 3f059f602c5f..3dc77be88ca1 100644
--- a/virtual/ooo/Manifest
+++ b/virtual/ooo/Manifest
@@ -1,13 +1,23 @@
-----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
+EBUILD ooo-0.ebuild 452 RMD160 49aeca43e0ae3d18b882ac6de00219755e474122 SHA1 58ac32f29fe48df5c3a1e438e538a47454f0e7ff SHA256 e068b835b659f62959d09857ad6acf3a9061bf197a8ec97d086601c99ca6d202
+MISC ChangeLog 726 RMD160 dcfdb439f73bbcdd58c9fb4361ce3bde6506bcda SHA1 f0cc82f52a5619bb033226629c609ab2615f5bfc SHA256 05d34f08be9374c1a177561cbc722eab1fb08bae14824e21d5bcbb05187e5d5f
MISC metadata.xml 163 RMD160 68888b3756b2cf14b88ff5aa31e4fd07c9cc9713 SHA1 bd3e6fae69f40f453bc382ae8f1a7644a590a9cc SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk5grgYACgkQHB6c3gNBRYfH0QCfdwrp0XVJdINcAt2YWvlBA+5Q
-nU8AniLvZYRSBWarNAeRqSVV4UVuFibF
-=VVAd
+iQIcBAEBAgAGBQJPgFsVAAoJEOSiRoyO7jvolRMP+gLTMbt2mkR4A4cpngsq8Nl9
+JpfeKbVs9zNNMHViavbDNURzkdFMNSqzKImZne694POJsAIfJtcjjTarSGtIFUST
+qYy/qidn428eMGiRYM8j2q1dwhEtcCYX41vfevECqkOAKOcwWWsYHAeYv3GbohnI
+YRoVzpsL6daaqcfWDy0eBCCTfwL9jD02AuDqVXbOnFCczWr+QYbqUOSkkBV4VzPU
+q3ER8hSaICGb3nzkJ2uqWxMZ8oP7+D47QoIdYoeagkHXotRLURTFAuWbKepEDFJd
+werw2NzAFQFxlaJGXg928CuZwa9oEC4rqMHoSPOoGboS6ejsjRQBm+oNKGHmIsYU
+beOKnE48Hv4ZNB9OxVjfi4ddjJ4iaGFURGtgVBqF+CBT8mvL1RKB8vqsRz/00CIF
+AYQJzi6hVY1zpCotN5Avk0kgGNtIYw1MxfcVx6jJKCEBMVQTxD6Ux8T97oVXREqN
+sFfmJ5SI/CxoY0Gl2Mv/D8wLBdbip+2id0xzS/83p7V39yx8EX6Yy8VN4HkhVFvY
+lLJCu9A2RKel44VcZXeEBxRHwBzU+0TdYzt3uvnogHGU3J2V30NMlbGuq125a6Hv
+8Dgv/yCdKOfKyzUnPawVxHFQjUPLH5ZmBLu1x1lfAIu07Zq48BWymPOY5ZZLbM2a
+WGpUPjwhsfkxYGg41DjI
+=3rWl
-----END PGP SIGNATURE-----
diff --git a/virtual/ooo/ooo-0.ebuild b/virtual/ooo/ooo-0.ebuild
index 8c990d2fb6f9..afb6e8553872 100644
--- a/virtual/ooo/ooo-0.ebuild
+++ b/virtual/ooo/ooo-0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.5 2011/09/02 10:20:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ooo/ooo-0.ebuild,v 1.6 2012/04/07 15:19:36 scarabeus Exp $
EAPI=4
@@ -11,12 +11,12 @@ SRC_URI=""
LICENSE=""
SLOT="0"
KEYWORDS="amd64 ppc x86"
-IUSE=""
+IUSE="java"
DEPEND=""
RDEPEND="
|| (
- app-office/libreoffice-bin
- app-office/libreoffice
+ app-office/libreoffice[java?]
+ app-office/libreoffice-bin[java?]
)
"