Update ebuild to pass under both -java and +java cases.

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

3 files changed, 30 insertions, 52 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 7e05c4cf68b5..efc5300a0305 100644
--- 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.147 2011/09/23 14:44:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.148 2011/09/25 13:06:25 scarabeus Exp $
+
+  25 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-9999-r1.ebuild:
+  Update ebuild to pass under both -java and +java cases.
 
   23 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-9999-r1.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b55d7ae275ca..291df08ebed7 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -173,23 +173,23 @@ EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c0
 EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18350 RMD160 54bbfb6be956667016eefe1dad15737cc44e1deb SHA1 59dafcc4461a5c8571f814b41843950420b54fdc SHA256 8f883984653e50045ec2404ce4286950bafd82cf31e97347edc38a61e1fe2b4d
 EBUILD libreoffice-3.4.9999-r1.ebuild 18444 RMD160 6209f79b7aee2ef034810b62a30d80a6c573e683 SHA1 76cd9106979325bbc55127c9a37d83514f179a11 SHA256 578c8666330d5e81c00f11127f6c671e780addb01ac8052dcf508388b691c8fb
-EBUILD libreoffice-9999-r1.ebuild 16335 RMD160 0ba68d4969b908aefb822870982280011d6efdd0 SHA1 5be0670d2466f3f3ceb7480f9fc9fb0eafab4014 SHA256 94098206ed0443665ce6d160864f3becee37df2eba88d425cac285452df65dea
-MISC ChangeLog 28139 RMD160 df17e73697282c709dd2cab14ac222eb908980c5 SHA1 06c410c15567d2d49bb7e21012bd67cb6c23c2f6 SHA256 56bad45102c07c9b9f1aadfc747bb423b11f679d9519352a397c941a52458463
+EBUILD libreoffice-9999-r1.ebuild 14058 RMD160 5b53978fff1bd55b7e77867f17d4ee09aa628ea6 SHA1 a074febb85d7e79601c4de1361bd53381469ead2 SHA256 45f29f01999aba60db12e9f3ee9e844414825029eb07618de7478ceb2560351f
+MISC ChangeLog 28283 RMD160 ef473f5c4c3ac44368e736734865bee1f024e944 SHA1 7f455b95381055a4507122be6c8862f4c8fe9ec7 SHA256 ff2891359f6c561faeb3c170130f9c0eebd3fde8587e7d3dfc424578fc5215b2
 MISC metadata.xml 1060 RMD160 d45f264670abdfa12c42935b489af5f462f70189 SHA1 d3932fab9bb5ab0bc404a95c60fa6a03f08044bd SHA256 f7a39bf4b3077ec5bada9e35940d1a02dcf9a62b77a56cc6346f750528a1e092
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOfJs8AAoJEOSiRoyO7jvoyOsQAIutgrzcEImGTZbm5qwaGw2M
-I9qRyMCdYylX+Q6wiOxHBbqk+ACHwYzggPgjeXn5lB47p3TwxI7Q5Lf96z2OQbrz
-bTIP/j9KBWLClVk18IMMk5AHjnGqh6xBuy2qtLhJT2WcSfxMryYNOsmdCcWncxTT
-Sg/bmyKcHROx+T57wsS/t0eZWhCY/UmVLa2CYFGq47qDSwrK3wAvywObBgWy/fm7
-I93O2oP7E95FqZ8Xj02x1gyj4hhJJ4r1L3OPIZi6uVDtMCzd1oijjj0XYDwOF9k8
-2ybyeGOFkAwaAA9UPfFq5ujjel+5t4G1BiFIwcqasyYr2QnFrk/mk4AMzbuAz8Se
-Qj9r3oa08YBjrWZ2wIi7cHQ2O3499ffs2jiWhZZoHgqXsPL92uoNhCCGnAS0QYQw
-fZ66e50LKeyj8eijb9S/C8rKNjOuzgAwr3YnXxW2I/SN7nI+xwb8BFd8AlyvEeCw
-TNvO0jMjRbDhRmIzqPcAWznMZYT2y4wpOsEbq8coH0Agl22cV0ay9rg7/fWYb5LY
-quHo4mVpwg7KRtNYgtplwiQGtEAXXPTFj0yRM9fX8WDooVESiBYVjGe66Hwln0wB
-yjzyJy87v1yo0ADslzET0qwNIjTJr4I7UXd8GDFZSc4zsPM642p6rqtO0X4QUIZP
-0DT9rz+UtceS0bj8gMlk
-=0+RC
+iQIcBAEBAgAGBQJOfyc2AAoJEOSiRoyO7jvoYSUP/AuI6uHKE9hE/U4irx7qAO0/
+hfxhQbUWbPO8tp74IezyYtb8te+2Wo7F2pxT+F+7UjyBP2WM5ViMJCRkbr8/ipJE
+aRLGpBcAKnzxO3u09lhbDLikEe2qzUuyCr5WknCcyWFg31WckFqwheCejIxp0sdU
+ayyd3y57SolX1qIxSZ8F0C+pWgcOlqW4DiAwts2Sov5N9ZeXJ14/2DCilkWKb4QF
+KOb9gIPKjI642bwTMUFwNWIuneOTfrAFoQQqskVFODWJFbMrq9a6/jVRmGbzdLeO
+mHCbKct5V/cUE17iw/tQ5WA/avroZjFxVv+RUDFcmf+6koMdzwQk5px7SH+IzZ6K
+e1LHeFEm1uRnILknWRUJSQGzRe2f2wnhb9gl/b8Wpp5MRy9G34k2BxT2uYHUgiWh
+zC/4H6Q22sDnKZfaCFh0YTGDtWzqehIuA4WYbf5Mq1a5P6reGHPI9kuqK7NK1TU8
+09B+Rxpczou7TdLxTd0JqVOfhamK3OU3dEbwmpbUF9HltRVurWMUdYrGWI8leGfg
+G4ws/VXG8+tVNnWiW0PGSeLn9jtHixMyxE2PNiEm+QfsVgvRUcr4OxrFiwlOp6zx
+skVdIDIX1KiroFdQhb334lD+yDQ1vZNc+uITxaq5cFrOAndSwhB9ylM3xgxyUB9U
+urJ98No7c1875P8J06zL
+=ywX2
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index a4624aac683e..186db692228a 100644
--- 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.23 2011/09/23 14:44:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.24 2011/09/25 13:06:25 scarabeus Exp $
 
 EAPI=3
 
@@ -47,40 +47,11 @@ if [[ ${PV} != *9999* ]]; then
 fi
 unset DEV_URI
 
-# addons
-# FIXME: actually review which one of these are used
-ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
-ADDONS_SRC+=" ${ADDONS_URI}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt"
-ADDONS_SRC+=" ${ADDONS_URI}/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"
-ADDONS_SRC+=" ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
-ADDONS_SRC+=" ${ADDONS_URI}/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
-ADDONS_SRC+=" ${ADDONS_URI}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
-ADDONS_SRC+=" ${ADDONS_URI}/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz"
-ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
-ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip"
-# REALLY REQUIRED
-ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
 ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
+ADDONS_SRC+=" nsplugin? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
 SRC_URI+=" ${ADDONS_SRC}"
 
@@ -378,10 +349,11 @@ src_configure() {
 	# --disable-static-gtk: ensure that gtk is linked dynamically
 	# --disable-ugly: disable ugly pieces of code
 	# --disable-zenity: disable build icon
-	# --with-extension-integration: enable any extension integration support
+	# --enable-extension-integration: enable any extension integration support
 	# --with-{max-jobs,num-cpus}: ensuring parallel building
 	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
 	# --without-stlport: disable deprecated extensions framework
+	# --disable-ext-report-builder: too much java packages pulled in
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
 		--with-system-headers \
@@ -390,6 +362,7 @@ src_configure() {
 		--with-system-db \
 		--with-system-dicts \
 		--with-system-libvisio \
+		--with-system-libexttextcat \
 		--with-system-translate-toolkit \
 		--enable-cairo-canvas \
 		--enable-largefile \
@@ -404,6 +377,7 @@ src_configure() {
 		--disable-epm \
 		--disable-fetch-external \
 		--disable-gnome-vfs \
+		--disable-ext-report-builder \
 		--disable-kdeab \
 		--disable-kde \
 		--disable-online-update \
@@ -415,7 +389,7 @@ src_configure() {
 		--disable-zenity \
 		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
 		--with-build-version="Gentoo official package" \
-		--with-extension-integration \
+		--enable-extension-integration \
 		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
 		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
 		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \