New ooo-build-release (2.0.4.11) also get rid of the -system-tarball (and save 27...

Package-Manager: portage-2.1.2_rc4

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 80e2300bf03f35ef1f57ad3ec4e6f28c4a882667..51e0d46041e63f4fe8a59f1fffc307c46aa12fe7 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.279 2006/12/11 20:48:17 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.280 2006/12/24 09:18:16 suka Exp $
+
+  24 Dec 2006; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.4/gentoo-2.0.4.diff, openoffice-2.0.4.ebuild:
+  Another release of the patchset - ooo-build.2.0.4.11. Also some minor fixes
+  so that we can get rid of the system -system-tarball. Which is: Yeah - some
+  27 MB of Download saved.
 
   11 Dec 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.4.ebuild:

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 1eee0c83d8b647a2d5ba1b0f6f7c81a6c6cd80dc..e5aa4b539acf2b9c49a4bdbbfe93154411bddfa3 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,10 +2,10 @@ AUX 2.0.3/gentoo-2.0.3.diff 523 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9
 MD5 919be84ef3c8315b84c37cdd1f5b947d files/2.0.3/gentoo-2.0.3.diff 523
 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 files/2.0.3/gentoo-2.0.3.diff 523
 SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527 files/2.0.3/gentoo-2.0.3.diff 523
-AUX 2.0.4/gentoo-2.0.4.diff 523 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 SHA1 84f3aa66994463524e53fceac8d6e3fc143f00d1 SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527
-MD5 919be84ef3c8315b84c37cdd1f5b947d files/2.0.4/gentoo-2.0.4.diff 523
-RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 files/2.0.4/gentoo-2.0.4.diff 523
-SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527 files/2.0.4/gentoo-2.0.4.diff 523
+AUX 2.0.4/gentoo-2.0.4.diff 788 RMD160 933095a0fa6335cca7a16eeb6b81c109ac8110e3 SHA1 61b456274b52724596c569c972c7ea72a04c86fb SHA256 2f4fef7557c61122a7d2897a44f5793acaf7d06cdb2cb6fc0e692fa233980295
+MD5 1bbea5010bba67ec6bd7423833857c03 files/2.0.4/gentoo-2.0.4.diff 788
+RMD160 933095a0fa6335cca7a16eeb6b81c109ac8110e3 files/2.0.4/gentoo-2.0.4.diff 788
+SHA256 2f4fef7557c61122a7d2897a44f5793acaf7d06cdb2cb6fc0e692fa233980295 files/2.0.4/gentoo-2.0.4.diff 788
 DIST OOO_2_0_3-binfilter.tar.bz2 17307831 RMD160 a8bb291789bee4692804f8fc3b32ce204689d7a3 SHA1 fa89f8f7c1414b365b78467dc4007d802e9ffd68 SHA256 eeb478603262ea62bc749f6698512bf0463d66cc2a5669db6ecedeb937577864
 DIST OOO_2_0_3-core.tar.bz2 109469286 RMD160 d40a11614ef9d25b6af96485877a347ffb6cefd0 SHA1 2ec6cee1fad05c128eb8c0b4e4ab7d9ca1b2c71f SHA256 0d6889e0426590e58c546ca03d227f266ced7de41bc55bcec7ff6f3cfd238c2d
 DIST OOO_2_0_3-lang.tar.bz2 64201627 RMD160 f893f84ad3c3526c15eb935163d7d98c201d225d SHA1 7525407d609a40ff1edb2c3b74642fd5e83d7921 SHA256 d9120ed91073ec624e60e604872611ecbde204300762874cf5a673addfda4dd8
@@ -14,28 +14,27 @@ DIST OOO_2_0_4-binfilter.tar.bz2 16802527 RMD160 2574dd0cef9d6976b62e0a16d75b577
 DIST OOO_2_0_4-core.tar.bz2 121332967 RMD160 bc57ce5f6ff0a4ef714cbf7097b319d61d7ffc25 SHA1 19adc4be9306d3d05ed6da23f2d9c66bcededa51 SHA256 010dfa7b87a426ccea82a14c53877280a771448b9d935a49a636e82512e58cff
 DIST OOO_2_0_4-lang.tar.bz2 71585371 RMD160 acc3c0507011bad12a8c423e73bf5ea4750500e1 SHA1 aa517e80b6bdf3c80d738b6dd18aee85588f19ab SHA256 f22f54afe7a8bc4aae9b0714b5028600911bc8bd2b54b4c4f40839c508daaa5f
 DIST OOO_2_0_4-sdk_oo.tar.bz2 29295983 RMD160 60ef50b4206d3424103289a53d1cd897729c85e7 SHA1 b97adf5342b513dd5d42bda65ef9dfc1f4b2a1c2 SHA256 fad5de27f827c31064fea1e222092079af98866680e4be57b610dd5015a7da0d
-DIST OOO_2_0_4-system.tar.bz2 28794627 RMD160 f47a7d516f79ac4734e04cf6cbbcb7424a573d59 SHA1 af844362349ffd45bbf7071448bf3c1ae3ebf08f SHA256 4601d6dd0483b1df1f975bc3ccae1f6c354a4e083ade94483e8a31842bd9da5c
 DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
 DIST extras-2.tar.bz2 94740 RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd SHA1 2c7fca93c106e23961f4aaa7cdfcaeb97064eed1 SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
 DIST hunspell_UNO_1.1.tar.gz 13774 RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 SHA1 d72420069de87062b3e5b4f45235a7bc2c1e124a SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149
 DIST libwpd-0.8.3.tar.gz 482757 RMD160 f8010300e50e1c43942e6a84a3b526738edb4ed5 SHA1 397b33bf77a6bfbab71ca3de7e42bc99ab80fdd6 SHA256 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c
 DIST lp_solve_5.5.tar.gz 495452 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 SHA1 1cb19a392a4b3370adc3513964f7a351ad605875 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1
 DIST ooo-build-2.0.3.0.tar.gz 5158406 RMD160 45eb102b17f4b55b1b44f0eb08a933b75b9eb3dc SHA1 a8d5c3d264819620bcb0122342558debc50c8729 SHA256 b425013aa40d1fd4e3d596a38b2add86ae9c4d7e84cc23e1b2b5e924553efd7c
-DIST ooo-build-2.0.4.10.tar.gz 4666697 RMD160 e53dbdda835d78e03e8c5a919d90d5b15fb90c94 SHA1 caed9ccfd1cc0a5e87c79c215b1c934cc887c91b SHA256 c46dc56638fbec9bd633e5edf602eeaab67779680167c4182f3feaae4b92c0c9
+DIST ooo-build-2.0.4.11.tar.gz 4675395 RMD160 73f7f981f3d4a15f879bbd8cc41d1690be4d6dd7 SHA1 102c4df8e14a95bbf410c0364089d39c4f70e563 SHA256 f3164e2242fa8bbe4e196bcac8c9ab332f33542940c3677d58bd13fc3a3c55ca
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
 EBUILD openoffice-2.0.3.ebuild 9145 RMD160 60a33696dbe9eecd555720610c34ccfdf834efcb SHA1 d42a09fee83af8596c59250f711d2618b93b10b3 SHA256 ca6828638a3c30e4cde1ebd454e566f6718fbea528befc1c1fd9caf928054f30
 MD5 59f7b5eb1b353c0bbd22dc07607acfcf openoffice-2.0.3.ebuild 9145
 RMD160 60a33696dbe9eecd555720610c34ccfdf834efcb openoffice-2.0.3.ebuild 9145
 SHA256 ca6828638a3c30e4cde1ebd454e566f6718fbea528befc1c1fd9caf928054f30 openoffice-2.0.3.ebuild 9145
-EBUILD openoffice-2.0.4.ebuild 9761 RMD160 e25de18d37a1206154b47017a958c0406c7daacd SHA1 d4586a8223cbb7b4c1be29b048d22d6c81d1ed26 SHA256 a66314255a78b9e165f60c91f97d85148149203c2f0e05379093713dc9d10332
-MD5 31c06293dd37917c2f1abd5c755944e6 openoffice-2.0.4.ebuild 9761
-RMD160 e25de18d37a1206154b47017a958c0406c7daacd openoffice-2.0.4.ebuild 9761
-SHA256 a66314255a78b9e165f60c91f97d85148149203c2f0e05379093713dc9d10332 openoffice-2.0.4.ebuild 9761
-MISC ChangeLog 58219 RMD160 e8b05d231d0772b9e947bd4452bd7a1a2c0bf1c3 SHA1 aa7c0c90e29940596d768a448c40a310fae9f723 SHA256 00df7b5ca2e90ab05921c19e138b8a64855c83a2bc875a65f188dbcbb354a468
-MD5 b16b2a9d95e2bf058662927ad595c70b ChangeLog 58219
-RMD160 e8b05d231d0772b9e947bd4452bd7a1a2c0bf1c3 ChangeLog 58219
-SHA256 00df7b5ca2e90ab05921c19e138b8a64855c83a2bc875a65f188dbcbb354a468 ChangeLog 58219
+EBUILD openoffice-2.0.4.ebuild 9715 RMD160 c821068736f6fb417c503cd5c69430bcdb19c7d2 SHA1 599f8c62042c0dfc3e7a31661f1cc4974d3db8d7 SHA256 ae9daa875ffd381b63cc87dbb5d8ad6567b61ccab23179ae78a5998eecf33cdd
+MD5 d1ff1a1eaa67da950c115b0bf025221a openoffice-2.0.4.ebuild 9715
+RMD160 c821068736f6fb417c503cd5c69430bcdb19c7d2 openoffice-2.0.4.ebuild 9715
+SHA256 ae9daa875ffd381b63cc87dbb5d8ad6567b61ccab23179ae78a5998eecf33cdd openoffice-2.0.4.ebuild 9715
+MISC ChangeLog 58514 RMD160 8db410800ec854104adeff888efe75ebc73b080b SHA1 eec84fbc1b7e611d32b6ac41b6ab6526ecf1a3ba SHA256 5ef0b85b5fd1f5ada7d3396af72ebb8771604e08f31181709440556abe41d4c1
+MD5 8b4e4a3e27f755ab809b4b8ee016b832 ChangeLog 58514
+RMD160 8db410800ec854104adeff888efe75ebc73b080b ChangeLog 58514
+SHA256 5ef0b85b5fd1f5ada7d3396af72ebb8771604e08f31181709440556abe41d4c1 ChangeLog 58514
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -43,6 +42,6 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 f9a102aadbdca7178bbd6e999c927fa1 files/digest-openoffice-2.0.3 2494
 RMD160 1da3fb19c062a849391223360384da3dd4089361 files/digest-openoffice-2.0.3 2494
 SHA256 411493117843e817aad3c972ce94b2f9ca92f59a815b20b985e875c32da8cdba files/digest-openoffice-2.0.3 2494
-MD5 77ea0c1934fe8e1d1a2cd17085f95480 files/digest-openoffice-2.0.4 2949
-RMD160 1ed016314077d7290184432f5777e200bafecf95 files/digest-openoffice-2.0.4 2949
-SHA256 f4674d52e32c334cd344c4bb3d89e60c65fa56be6d9b7695ef323ec835d5ba51 files/digest-openoffice-2.0.4 2949
+MD5 e837d4be9f6b62e483edd69a87b84a45 files/digest-openoffice-2.0.4 2690
+RMD160 fe56e14aa7634660083562d9114978cfded8e489 files/digest-openoffice-2.0.4 2690
+SHA256 b069f01aacb01cc7136aad7b37f65aee07a3cfc574902972e4b1d48cabcd0890 files/digest-openoffice-2.0.4 2690

diff --git a/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff b/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
index a64755cbb2d18492c2155e9a8e9614596d44c6e9..259ed71a81ddea59af8f0287114b51733505fcc2 100644 (file)
--- a/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
+++ b/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
@@ -20,3 +20,13 @@
  # And here we go.
  exec "$SystemInstallDir/program/$Binary", @ooo_argv
  
+--- distro-configs/Gentoo.conf.in 
++++ distro-configs/Gentoo.conf.in 
+@@ -11,7 +11,6 @@
+ --with-system-libxslt
+ --with-system-stdlibs
+ --with-system-xrender-headers
+---without-system-jpeg
+ --without-nas
+ --without-myspell-dicts
+ --with-vendor=\"Gentoo Foundation\"

diff --git a/app-office/openoffice/files/digest-openoffice-2.0.4 b/app-office/openoffice/files/digest-openoffice-2.0.4
index cccdf6b9116787c08fabbd2573b254be0ba68743..5f336756e241b714553be61fd4f1f1e09d43983e 100644 (file)
--- a/app-office/openoffice/files/digest-openoffice-2.0.4
+++ b/app-office/openoffice/files/digest-openoffice-2.0.4
@@ -10,9 +10,6 @@ SHA256 f22f54afe7a8bc4aae9b0714b5028600911bc8bd2b54b4c4f40839c508daaa5f OOO_2_0_
 MD5 b10a51b80287da2fe92267734ae073bf OOO_2_0_4-sdk_oo.tar.bz2 29295983
 RMD160 60ef50b4206d3424103289a53d1cd897729c85e7 OOO_2_0_4-sdk_oo.tar.bz2 29295983
 SHA256 fad5de27f827c31064fea1e222092079af98866680e4be57b610dd5015a7da0d OOO_2_0_4-sdk_oo.tar.bz2 29295983
-MD5 7d5aa9932eaf739bd63449d16cc6a6d0 OOO_2_0_4-system.tar.bz2 28794627
-RMD160 f47a7d516f79ac4734e04cf6cbbcb7424a573d59 OOO_2_0_4-system.tar.bz2 28794627
-SHA256 4601d6dd0483b1df1f975bc3ccae1f6c354a4e083ade94483e8a31842bd9da5c OOO_2_0_4-system.tar.bz2 28794627
 MD5 1948e39a68f12bfa0b7eb309c14d940c biblio.tar.bz2 6000
 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 biblio.tar.bz2 6000
 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b biblio.tar.bz2 6000
@@ -25,9 +22,9 @@ SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell
 MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
-MD5 e7494d104e01420055a601b85d352be4 ooo-build-2.0.4.10.tar.gz 4666697
-RMD160 e53dbdda835d78e03e8c5a919d90d5b15fb90c94 ooo-build-2.0.4.10.tar.gz 4666697
-SHA256 c46dc56638fbec9bd633e5edf602eeaab67779680167c4182f3feaae4b92c0c9 ooo-build-2.0.4.10.tar.gz 4666697
+MD5 264ade045f9829ad45b1a5ae0cb6b368 ooo-build-2.0.4.11.tar.gz 4675395
+RMD160 73f7f981f3d4a15f879bbd8cc41d1690be4d6dd7 ooo-build-2.0.4.11.tar.gz 4675395
+SHA256 f3164e2242fa8bbe4e196bcac8c9ab332f33542940c3677d58bd13fc3a3c55ca ooo-build-2.0.4.11.tar.gz 4675395
 MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
 SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144

diff --git a/app-office/openoffice/openoffice-2.0.4.ebuild b/app-office/openoffice/openoffice-2.0.4.ebuild
index a246062a92556fcdd2895805cb7db1e7902dc061..8b180cb4aef107c18a5bfb33c946636b75d0a233 100644 (file)
--- a/app-office/openoffice/openoffice-2.0.4.ebuild
+++ b/app-office/openoffice/openoffice-2.0.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.21 2006/12/11 20:48:17 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.22 2006/12/24 09:18:16 suka Exp $
 
 inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions multilib toolchain-funcs
 
 IUSE="binfilter branding cairo cups dbus eds firefox gnome gstreamer gtk kde ldap sound odk pam webdav"
 
-MY_PV="${PV}.10"
+MY_PV="${PV}.11"
 PATCHLEVEL="OOD680"
 SRC="OOO_2_0_4"
 S="${WORKDIR}/ooo"
@@ -15,7 +15,6 @@ CONFFILE="${S}/distro-configs/Gentoo.conf.in"
 DESCRIPTION="OpenOffice.org, a full office productivity suite."
 
 SRC_URI="http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-core.tar.bz2
-       http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-system.tar.bz2
        http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-lang.tar.bz2
        binfilter? ( http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-binfilter.tar.bz2 )
        http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
@@ -68,12 +67,14 @@ COMMON_DEPEND="!app-office/openoffice-bin
        >=media-libs/freetype-2.1.10-r2
        >=media-libs/fontconfig-2.2.0
        cups? ( net-print/cups )
+       media-libs/jpeg
        media-libs/libpng
        sys-devel/flex
        sys-devel/bison
        app-arch/zip
        app-arch/unzip
        >=app-text/hunspell-1.1.4-r1
+       >=app-admin/eselect-oodict-20060706
        dev-libs/expat
        >=dev-libs/icu-3.4
        linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
@@ -102,7 +103,6 @@ DEPEND="${COMMON_DEPEND}
        pam? ( sys-libs/pam )
        !dev-util/dmake
        >=dev-lang/python-2.3.4
-       >=app-admin/eselect-oodict-20060706
        java? ( || ( =virtual/jdk-1.4* !amd64? ( =virtual/jdk-1.5* ) )
                dev-java/ant-core )
        dev-libs/libxslt