More smple cleanups.

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 89e84cac9399bf924e8d18bb2516aaad86412cd5..e4c6095a92cfdb853dfaace7822cce264786a242 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.134 2011/09/17 01:26:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.135 2011/09/17 03:28:18 scarabeus Exp $
+
+  17 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-9999-r1.ebuild:
+  More smple cleanups.
 
   17 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 962dcf83e715aaefad99950e0312163a689901c4..f6566abe0f231ee289bea936696d01c5a281eb52 100644 (file)
--- 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 18356 RMD160 51b1cb846c7900663975354fd6f1d7cf0f22a177 SHA1 c7c39420e80a0644d8260db8be7a6df4ac5f6870 SHA256 028fb7cbf31d0e5189d226d7fe6d78a5fed657cddbadb84d3801ba5665f1ea5f
-EBUILD libreoffice-9999-r1.ebuild 17491 RMD160 652e4378be8e0d1edaed4242a273189e6c732a00 SHA1 d6719042ef65ea74a50e76a172d43f8c2d87c2f9 SHA256 628aa7412b9caf2bae69d4ea80460701b5da984e7c007af02c7f1c503059fe00
-MISC ChangeLog 26387 RMD160 dd3e40e45ac8fd426520ff181ba9247b39d252e9 SHA1 fdacd95cf882758f92581d995a5c9bc7b5300062 SHA256 74163fd975c3f25f7b8419505dcfb6b223654b315a42c45b7b017c0b0e5e364f
+EBUILD libreoffice-9999-r1.ebuild 17309 RMD160 a301fe18d2799108ce9baa1df34139425fc805c7 SHA1 d4d94c16ee3dd94ea850b9b399233befcebda91b SHA256 b665138b66678fb14bcd11dda4703aab42094abd4ed127ab6bd1c878729bb440
+MISC ChangeLog 26496 RMD160 bb7482480af0cf3f6f63b4e7f8d4d364fe49e942 SHA1 d82a0464d1592a806b48425c60252e8a87d5fb25 SHA256 958b2374d2dcbf306932f9c6e441726b3125adee3321597c9a9de42ad93193d6
 MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOc/dmAAoJEOSiRoyO7jvohGIQAJnCAckH0qDiRn8TKPcUqs2z
-Zbweh8kCFoOmxgxO7Fuhl6DupNuoxr3asFINSgyHR5s+TiggwYLhB8JReWtLtoZg
-XLo0gHV5e2g8g4vXrpdxJjNB6zMeGY6ipxt759FI1dp0yJ1cD7f1aAhhNa8non44
-nmNDRiyf+nklyb20B1ajCdE0YYObmjccXnILVEWjki7pVFKiyUPQT8LOiEsjNsAQ
-K7+EBsMZI0c9sdMZBKRtzxK9DuGUgD2xz4cMOj9FdjroZ5VK19jRaCawZRXaZFh0
-0MkE4lYbRLPDkvKRbvirF1gGzaQc75Bn6Qi/4004d3kitZ8PNuRe+havh+t1o8fg
-/z41Ov2qf5uI1xbbX1gxD04RSpS/oENg8fqwIDF13SEHlkr0K0+ZhRnAyiNqmWgu
-p5isvVwN0Hff6zKV/XifrbKHdZKHaXmhU7aoepKMDhp6t/t4BpeRxd8Duowv0LZd
-705IBxo6S8mV0+r8AA8VVRI3/46HLSL96+g5PiztKVn3CSyO+8rB1utiE+gThZdX
-jAuHVmvrjME/En1WkgpnL1h0sHpXPzOb4GHshvffOq91RFYQvSCbrQmkPHaarVnR
-I/MjoXYMPFElih3rCZdg9rQ2kiIE8jWQvH8ufSomOWzykE9BecAqPdNy4x0DzV1P
-/QUYke6ZO2XeS1E9tswh
-=5b5u
+iQIcBAEBAgAGBQJOdBPqAAoJEOSiRoyO7jvor5sP/0FMzDw78iP4UWdSeJUFV1Y1
+zKOwZq8xBj0Zl7vl0DN6AZi3S56WKiyDyR0LczchYHG0Y13cWMCQWRqrdYuMgp5h
+bJg+c1HXPPC7HyfIhIke++vFhDBXrET/YbRvChOhKlini1a+f2igASjR03zzBh5R
+phSDamHo1Eao6nY3T9WEu9HrJoLUL15s5JCDVaZM+9vwOI73shQXM+MNoB4zN7eK
+dApJycy0TaBxD+tkWtALn018YPejHKXR0sDlcV6fY4Ryi4fXwj+Q6RMfsxgqmLY6
+2QR34Z7uSQVtlxjZCjAmbIbBhtdTiWUjDN4MlBATcW91tSxIoZINtNZUWfUi4f8h
+EAmPOW9GXijGq6A9fJuufM6V1qBLc0d6eP0RFZnsPze1lT60+0CQw2Z2Tc0v+Idi
+PMVJJRyaoAMOPwsvhBOoXxjoIOgHEQTfC4qE0h2oDP5L32sYL7XNc8NTxf9ST2Vh
+hNXy85UiKWCHzeQX9q8jmJLDy5eeBHGmEj60QapcS4HgRXArdrRBucDK0wvVkQ98
+fMJsJVAd/CK2nMAbXiOAUWnHr5bc7zgoo6jz16K1M0++OHPQ1uzGu8BQrs4PKbDR
+NSklOgW5jW0S3hP8+lGEFvEFHmVoOuvzW0n+5Mk2++lEsPt3WU8bAapQZZmf3Gt5
+0pJ6Y9yO6Sqczx4clInt
+=g+v+
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index 59b10c6b565050770c88f4949346551a973e8b1f..e5397757f333918226be8894900773565b221646 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.10 2011/09/17 01:26:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.11 2011/09/17 03:28:18 scarabeus Exp $
 
 EAPI=3
 
@@ -49,7 +49,6 @@ unset DEV_URI
 
 # addons
 # FIXME: actually review which one of these are used
-ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
 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"
@@ -64,7 +63,6 @@ ADDONS_SRC+=" ${ADDONS_URI}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sour
 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}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
 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"
@@ -80,6 +78,9 @@ 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"
+ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
 SRC_URI+=" ${ADDONS_SRC}"
 
 TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
@@ -346,7 +347,6 @@ src_prepare() {
 src_configure() {
        local java_opts
        local internal_libs
-       local extensions
        local themes="crystal"
        local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
 
@@ -357,13 +357,6 @@ src_configure() {
        use gnome && themes+=" tango"
        use kde && themes+=" oxygen"
 
-       # list the extensions we are going to build by default
-       extensions="
-               --enable-ext-pdfimport
-               --enable-ext-presenter-console
-               --enable-ext-presenter-minimizer
-       "
-
        # dmake: not worth of splitting out
        # cppunit: patched not to run anything, just main() { return 0; }
        #          workaround to upstream running the tests during build
@@ -394,7 +387,7 @@ src_configure() {
        fi
 
        if use branding; then
-               extensions+="
+               internal_libs+="
                        --with-about-bitmap="${WORKDIR}/branding-about.png"
                        --with-intro-bitmap="${WORKDIR}/branding-intro.png"
                "
@@ -501,8 +494,7 @@ src_configure() {
                $(use_with nsplugin system-mozilla libxul) \
                $(use_with templates sun-templates) \
                ${internal_libs} \
-               ${java_opts} \
-               ${extensions}
+               ${java_opts}
 }
 
 src_compile() {