Bump to ooo-build-2.0.4.6

Package-Manager: portage-2.1.2_rc1-r7

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index d2f9f7164bc24ad3113aac884d3f5c1f71d7be39..c18b358ad7beee5e68bb991620a5ad956290de76 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.271 2006/11/10 06:46:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.272 2006/11/16 17:57:22 suka Exp $
+
+  16 Nov 2006; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.4/gentoo-2.0.4.diff, openoffice-2.0.4.ebuild:
+  Bump to ooo-build-2.0.4.6, also work around problem with chown in the
+  install phase
 
   10 Nov 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.4.ebuild:

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index c89babd381b1a8fc25596cd71c6e00c465336a1f..83f94bdecb10b31b947bd657bed08c5fbd91a13b 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 1004 RMD160 3938845774bfd940cbb601a202934ebb51e4ffdb SHA1 b68f8404d806143d2c13a2f7ddc51fcccff74ff7 SHA256 eea5c0daff36a1fb7f990d8014e90a3fd1f1d813b94b7e14a929cf7d4e457237
+MD5 91e05710293ee2ba0b33fb08118f215c files/2.0.4/gentoo-2.0.4.diff 1004
+RMD160 3938845774bfd940cbb601a202934ebb51e4ffdb files/2.0.4/gentoo-2.0.4.diff 1004
+SHA256 eea5c0daff36a1fb7f990d8014e90a3fd1f1d813b94b7e14a929cf7d4e457237 files/2.0.4/gentoo-2.0.4.diff 1004
 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
@@ -21,21 +21,21 @@ DIST hunspell_UNO_1.1.tar.gz 13774 RMD160 9c0c31220d63894c9060a05fd136083b0b017b
 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.4.tar.gz 4631792 RMD160 50dc696f47e0883d99dc73701546e84dec5237c9 SHA1 a56637ea079b9ce63d3877870dbd67aaab580a21 SHA256 96176ce71a304fdc4827939e959d6a054d4e5f270d43dabc63bc61711b45a9d9
+DIST ooo-build-2.0.4.6.tar.gz 4639975 RMD160 5b27e45b7602cb9f3ffde4ae4cace4ec747639f2 SHA1 bb985f85b0e90f61b573b25fbc762d282ba0e513 SHA256 bc69cfb712703a74e1d30037e4f114ad07fc5a60592d9feddd763bc00b524659
 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 9668 RMD160 01769e6c4382ea99d7843c2816a6193275ff70a4 SHA1 2a08043901d5401bb2fe4633f01cbec96a6ac48a SHA256 648748ac8ac964b2bf1dab4329f4ba6bb544435ab3e04d8763b8de5d7eb702b7
-MD5 76e0f9e309bc3e662b0791f8c4a01618 openoffice-2.0.4.ebuild 9668
-RMD160 01769e6c4382ea99d7843c2816a6193275ff70a4 openoffice-2.0.4.ebuild 9668
-SHA256 648748ac8ac964b2bf1dab4329f4ba6bb544435ab3e04d8763b8de5d7eb702b7 openoffice-2.0.4.ebuild 9668
-MISC ChangeLog 57110 RMD160 e77af2b2233b72540a10154dfaf80766dad53a39 SHA1 601183b6bd37ecb40472b9fa60472e35683bedfc SHA256 ddeaeef1b1ce42d435516533a166ee268e0353f0a580a83c1dc968145c2b49e0
-MD5 2a9428bea24562768291d2c3363e9691 ChangeLog 57110
-RMD160 e77af2b2233b72540a10154dfaf80766dad53a39 ChangeLog 57110
-SHA256 ddeaeef1b1ce42d435516533a166ee268e0353f0a580a83c1dc968145c2b49e0 ChangeLog 57110
+EBUILD openoffice-2.0.4.ebuild 9661 RMD160 67c9afb018f042f5fdae06ad1bc2a9cfaca03776 SHA1 2716c6a61e30c14354378425b52095137fd78b7f SHA256 d94180a24f48703bd66c43326e67358d0aeea4471c8f2a7c44a090a669409e29
+MD5 86deecd50be822c863d2bb262d2fdf29 openoffice-2.0.4.ebuild 9661
+RMD160 67c9afb018f042f5fdae06ad1bc2a9cfaca03776 openoffice-2.0.4.ebuild 9661
+SHA256 d94180a24f48703bd66c43326e67358d0aeea4471c8f2a7c44a090a669409e29 openoffice-2.0.4.ebuild 9661
+MISC ChangeLog 57310 RMD160 b64ba7705e393fe4f4170b75512008de59b27521 SHA1 9c977c45fbd2aa2249d5e88ab09774b32cf74056 SHA256 3ef85c869079e761af6f857c7b514ab547f23265c6949b2fda4ffa479c776a27
+MD5 6b64a530709e46cc0c952b85e6252b4a ChangeLog 57310
+RMD160 b64ba7705e393fe4f4170b75512008de59b27521 ChangeLog 57310
+SHA256 3ef85c869079e761af6f857c7b514ab547f23265c6949b2fda4ffa479c776a27 ChangeLog 57310
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -43,6 +43,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 1f07b57251241367d456e4c68918f37b files/digest-openoffice-2.0.4 2946
-RMD160 ca4d696474ba4b46ea9bc0b491ad27f8a1104df8 files/digest-openoffice-2.0.4 2946
-SHA256 1ed623051245666bfdf3c0fc0a75bfdd986cf068e2ea06f19441980755f2d98a files/digest-openoffice-2.0.4 2946
+MD5 9ceeb172c76a7dad9694f02244de141e files/digest-openoffice-2.0.4 2946
+RMD160 95e716e9daa6a136425e518ac19e8b255d295f63 files/digest-openoffice-2.0.4 2946
+SHA256 fb69dc12e782ff8907ee5106a36cc677100517b3e9e78a54b134bdc16001d7c9 files/digest-openoffice-2.0.4 2946

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..298cb4712c182a6d78f73eb3c9ad1b6e1062fd81 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,14 @@
  # And here we go.
  exec "$SystemInstallDir/program/$Binary", @ooo_argv
  
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -69,7 +69,7 @@
+ Frugalware64: FrugalwareBase, 64bit
+ QiLinux: LinuxCommon, GlobalDesktopFiles, FilePickers
+ #Gentoo
+-GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, SystemJavaBits
++GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, SystemJavaBits, ICU36
+ GentooUnstable: GentooBase, GentooExperimental, BerkeleyDB43, STLport5, 64bit
+ Gentoo : GentooBase
+ Gentoo64: GentooBase, 64bit

diff --git a/app-office/openoffice/files/digest-openoffice-2.0.4 b/app-office/openoffice/files/digest-openoffice-2.0.4
index 30448380afc64f8948b2dd42af35424b410939c5..1f28d94698b743848af76d64c3e712d70127dbcd 100644 (file)
--- a/app-office/openoffice/files/digest-openoffice-2.0.4
+++ b/app-office/openoffice/files/digest-openoffice-2.0.4
@@ -25,9 +25,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 5530b257ddf08160858302b1bf756b65 ooo-build-2.0.4.4.tar.gz 4631792
-RMD160 50dc696f47e0883d99dc73701546e84dec5237c9 ooo-build-2.0.4.4.tar.gz 4631792
-SHA256 96176ce71a304fdc4827939e959d6a054d4e5f270d43dabc63bc61711b45a9d9 ooo-build-2.0.4.4.tar.gz 4631792
+MD5 8b02097f998a5286488272ed25f2802c ooo-build-2.0.4.6.tar.gz 4639975
+RMD160 5b27e45b7602cb9f3ffde4ae4cace4ec747639f2 ooo-build-2.0.4.6.tar.gz 4639975
+SHA256 bc69cfb712703a74e1d30037e4f114ad07fc5a60592d9feddd763bc00b524659 ooo-build-2.0.4.6.tar.gz 4639975
 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 2114ce8f237ab76f0ed91699f864b6ad99e0f016..771c311094d54b44113648d70f0824df177054de 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.13 2006/11/10 06:46:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.14 2006/11/16 17:57:22 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}.4"
+MY_PV="${PV}.6"
 PATCHLEVEL="OOD680"
 SRC="OOO_2_0_4"
 S="${WORKDIR}/ooo"
@@ -284,7 +284,7 @@ src_install() {
        doins fonts/*.ttf
 
        # Fix the permissions for security reasons
-       chown -R root:root ${D} || die
+       chown -R root:root ${D}
 
 }