Cleanup the build a bit to reflect the changes in the buildsystem.

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 59b92eb4a959492cedcb23c04bc8328bba183759..89e84cac9399bf924e8d18bb2516aaad86412cd5 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.133 2011/09/16 08:51:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.134 2011/09/17 01:26:38 scarabeus Exp $
+
+  17 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-9999-r1.ebuild:
+  Cleanup the build a bit to reflect the changes in the buildsystem.
 
   16 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 547ed1cd35bfbdd9b4fe8a086f107ec86797e223..962dcf83e715aaefad99950e0312163a689901c4 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 17577 RMD160 f7e1328668e87891ad46cc50dff9f4dcef357bd5 SHA1 dafb198595bf95de8764ad9f9505355de41cf777 SHA256 bf46e49a7a96e31e8b989a33ebe7576ee25eccb42477d7977586e0609ead7cd6
-MISC ChangeLog 26232 RMD160 74627e9e9adaff87e327be0acf12a9be03c38ef9 SHA1 cbe57cfb5250edbb6ecabf8b8b8a39dbd5481900 SHA256 7180087614c0fb00db72725c0c1898bd57f9d49fb979f5e2a3f1418aefac4bde
+EBUILD libreoffice-9999-r1.ebuild 17491 RMD160 652e4378be8e0d1edaed4242a273189e6c732a00 SHA1 d6719042ef65ea74a50e76a172d43f8c2d87c2f9 SHA256 628aa7412b9caf2bae69d4ea80460701b5da984e7c007af02c7f1c503059fe00
+MISC ChangeLog 26387 RMD160 dd3e40e45ac8fd426520ff181ba9247b39d252e9 SHA1 fdacd95cf882758f92581d995a5c9bc7b5300062 SHA256 74163fd975c3f25f7b8419505dcfb6b223654b315a42c45b7b017c0b0e5e364f
 MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOcw58AAoJEOSiRoyO7jvoO3cP/RPfPW2BrI1J3mzVaUljsQuN
-HFhoqHDmVwu3Kv1I5KeMGwYylS41C6czs8lmqbaPBPjODhxccXL24oq0sDxkrIzO
-3koC2VD6fJEYpMpg/hPIqOZ0O7gVaLYzd8GC6bTo7JXJOGdnDj85RtTvJp1mGcI5
-1PCsJXGYb3xi0K96qbYmOmSpbmv65szaySuhVYQ23AzBfKuGmeyUn4E2d5ImnOvk
-huxcDPUUnCEcl89q289a0h1fZpCkc+konpa02mtu5G6MuEzyxkFUlSLd/KSTzPn5
-gcSHG1P9EzdN01pVFwHSW9uXlAgzsJAIP2FmSpcptFXDXWx1nFjlhI2FDbpHMX6K
-q+dkxjL6kGDQS94iqA7z/NkzAwOYFcJ2RTRRBAb4S/9H7ihdQ+jFKCp3IJfjbjc0
-0AwHBoS1OmRLqFJxFVR+p/fTZREFVZZLqNTHRBRpZlrOlHJqugQotqe1QslubsDA
-VSiGR2NAiim5RY6eNolm8PLSIdGPmdRa5EnaGgTX6ZXL7/3j5lJG7vfOP9m0fqeJ
-nx0BMYGmcYmrdTr5oW7E9byTUcdjWeyYOwUx6Hf9+cEPK5hm2hroY2IA5qaYQgVj
-qOG/YIsgAtMQVaCigL2GfleALPCbszxBmRkDtEUstkHZ6/R2DFR/WEdNv+DMT0R3
-RlG8+mymL4EEyI7PYqh6
-=VqYD
+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
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index f7dd9bbbf26af11444329a74a02a5d43f74f5299..59b10c6b565050770c88f4949346551a973e8b1f 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.9 2011/09/16 08:51:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.10 2011/09/17 01:26:38 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}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
 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"
@@ -130,10 +129,11 @@ COMMON_DEPEND="
        >=dev-libs/openssl-0.9.8g
        dev-libs/redland[ssl]
        >=dev-python/translate-toolkit-1.8.0
-       media-libs/freetype:2
        >=media-libs/fontconfig-2.3.0
-       >=media-libs/vigra-1.7
+       media-libs/freetype:2
        >=media-libs/libpng-1.4
+       media-libs/libvisio
+       >=media-libs/vigra-1.7
        net-print/cups
        sci-mathematics/lpsolve
        >=sys-libs/db-4.8
@@ -339,6 +339,8 @@ src_prepare() {
 
        base_src_prepare
        eautoreconf
+       # hack in the autogen.sh
+       touch autogen.lastrun
 }
 
 src_configure() {
@@ -362,26 +364,19 @@ src_configure() {
                --enable-ext-presenter-minimizer
        "
 
-       # hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
        # dmake: not worth of splitting out
        # cppunit: patched not to run anything, just main() { return 0; }
        #          workaround to upstream running the tests during build
        # sane: just sane.h header that is used for scan in writer, not
        #       linked or anything else, worthless to depend on
        internal_libs+="
-               --without-system-hsqldb
                --without-system-cppunit
                --without-system-sane
        "
 
-       # When building without java some things needs to be done
-       # as internal libraries.
-       if ! use java; then
-               internal_libs+="
-                       --without-junit
-               "
-       else
+       if use java; then
                java_opts="
+                       --without-system-hsqldb
                        --with-ant-home="${ANT_HOME}"
                        --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
                        --with-java-target-version=$(java-pkg_get-target)
@@ -432,6 +427,9 @@ src_configure() {
                --with-system-jars \
                --with-system-db \
                --with-system-dicts \
+               --with-system-libvisio \
+               --with-system-libtextcat --with-external-libtextcat-data \
+               --with-system-translate-toolkit \
                --enable-cairo-canvas \
                --enable-largefile \
                --enable-python=system \