diff options
| -rw-r--r-- | app-office/openoffice/ChangeLog | 9 | ||||
| -rw-r--r-- | app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff | 35 | ||||
| -rw-r--r-- | app-office/openoffice/files/digest-openoffice-2.0.2_rc3-r1 | 27 | ||||
| -rw-r--r-- | app-office/openoffice/files/digest-openoffice-2.0.2_rc4 | 27 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.0.2_rc4.ebuild (renamed from app-office/openoffice/openoffice-2.0.2_rc3-r1.ebuild) | 8 |
5 files changed, 46 insertions, 60 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 69cc2aab61c1..d2ce25515a53 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,13 @@ # 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.188 2006/03/02 09:55:07 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.189 2006/03/04 06:24:52 suka Exp $ + +*openoffice-2.0.2_rc4 (04 Mar 2006) + + 04 Mar 2006; Andreas Proschofsky <suka@gentoo.org> + files/2.0.2/gentoo-2.0.2.diff, -openoffice-2.0.2_rc3-r1.ebuild, + +openoffice-2.0.2_rc4.ebuild: + Another new release candidate 02 Mar 2006; Andreas Proschofsky <suka@gentoo.org> files/2.0.2/gentoo-2.0.2.diff, +files/2.0.2/buildfix-without-mozilla.diff, diff --git a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff index 12f9d0aa2444..a6823f467255 100644 --- a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff +++ b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff @@ -1,33 +1,12 @@ --- patches/src680/apply +++ patches/src680/apply -@@ -64,8 +64,8 @@ - Frugalware64: FrugalwareBase, 64bit, Frugalware64Only - QiLinux: QiLinuxOnly, LinuxCommon, GlobalDesktopFiles, FilePickers - #Gentoo --GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown --GentooUnstable: GentooBase, GentooExperimental, GCJExperimental, BerkeleyDB43, AtkBridge, SystemJavaBits -+GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, GCJExperimental, AtkBridge, CalcSolver, SystemJavaBits -+GentooUnstable: GentooBase, GentooExperimental, BerkeleyDB43 - Gentoo : GentooBase - Gentoo64: GentooBase, 64bit - # Win32 -@@ -940,8 +940,6 @@ - #xt-precompile.diff - # build with -fomit-frame-pointer - omit-fp-workaround.diff --# hack: drop gcc libs --store-drop-gcc-libs-on-linking.diff - # more system db >= 4.3 - system-db-4.3-use-lpthread.diff - # iz#58474 - build this part with db 4.2/4.3/4.4 -@@ -969,6 +967,10 @@ - gentoo-gcc-naming-and-versioning.diff - # searchpaths of nspr/nss libs - gentoo-xmlsecurity-system-nss.diff -+# hack: drop gcc libs -+store-drop-gcc-libs-on-linking.diff +@@ -148,6 +148,9 @@ + # add no-crashreporter sections to testtool default config; + # also guess office path from testtool.bin path i#FIXME? + testtool-more-defaults.diff ++ +# Build without mozilla is broken i#59729 +buildfix-without-mozilla.diff - # - # NOTE: 64 bit OOo is work in progress! + [ TemporaryHacks < oob680-m1 ] + # fix for conflicting declaration NPP_GetValue() diff --git a/app-office/openoffice/files/digest-openoffice-2.0.2_rc3-r1 b/app-office/openoffice/files/digest-openoffice-2.0.2_rc3-r1 deleted file mode 100644 index 2cd0df0758f4..000000000000 --- a/app-office/openoffice/files/digest-openoffice-2.0.2_rc3-r1 +++ /dev/null @@ -1,27 +0,0 @@ -MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740 -RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740 -SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740 -MD5 4cc68d37ed3a3191bb78a14630e14c64 hunspell_UNO_1.1.tar.gz 13774 -RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 hunspell_UNO_1.1.tar.gz 13774 -SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell_UNO_1.1.tar.gz 13774 -MD5 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757 -RMD160 f8010300e50e1c43942e6a84a3b526738edb4ed5 libwpd-0.8.3.tar.gz 482757 -SHA256 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c libwpd-0.8.3.tar.gz 482757 -MD5 5efb35bbc25a4064a3aba80f8eb72fdd oob680-m3-binfilter.tar.bz2 17438881 -RMD160 5f9276184a14151c7950200a1b6298e00f4faedb oob680-m3-binfilter.tar.bz2 17438881 -SHA256 95417b75cd8d47dabb57568f8c7142cab49ce574deb8bd569ade03eb7af9a9fe oob680-m3-binfilter.tar.bz2 17438881 -MD5 6590f61f0e1b02f0787a8737e66daa98 oob680-m3-core.tar.bz2 109246218 -RMD160 8d25ab45b70409209241ccafe28bc95eac464d87 oob680-m3-core.tar.bz2 109246218 -SHA256 e86892a60ac653151de8a2fe6bec2297a330ac1a23c6f0122602ea7eae843a3a oob680-m3-core.tar.bz2 109246218 -MD5 6e6f3a866bdbbc98ccef63f406bb067d oob680-m3-lang.tar.bz2 58145978 -RMD160 7d46b0174c3ede324bcb89fd821b4e36f7b24063 oob680-m3-lang.tar.bz2 58145978 -SHA256 a0d8b58088a89656f893d054b9526fe3711c9cf8f8ed1999c3b9a29f2de1afa9 oob680-m3-lang.tar.bz2 58145978 -MD5 b26428134f3a468a96ec7a606c394198 oob680-m3-system.tar.bz2 25712853 -RMD160 63a59226fc3f06e4cc2bdb36e3e2c75ed832f436 oob680-m3-system.tar.bz2 25712853 -SHA256 93b0fea4a37cb1ee97426ced663cb851620206f99e8218df274352cb603edd9d oob680-m3-system.tar.bz2 25712853 -MD5 7a1cdfa1aa815ef88d16299ae366bc85 ooo-build-oob680.3.0.tar.gz 5032096 -RMD160 dc529b802490a4c054e96cf597655cd6b6cff340 ooo-build-oob680.3.0.tar.gz 5032096 -SHA256 036b05ee5feb72b26c91d95d7435a41675edcc17a96bb71af4b8d4d347b7874a ooo-build-oob680.3.0.tar.gz 5032096 -MD5 0395e6e7da27c1cea7e1852286f6ccf9 xt-20051206-src-only.zip 423516 -RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d xt-20051206-src-only.zip 423516 -SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e xt-20051206-src-only.zip 423516 diff --git a/app-office/openoffice/files/digest-openoffice-2.0.2_rc4 b/app-office/openoffice/files/digest-openoffice-2.0.2_rc4 new file mode 100644 index 000000000000..55b95b328d59 --- /dev/null +++ b/app-office/openoffice/files/digest-openoffice-2.0.2_rc4 @@ -0,0 +1,27 @@ +MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740 +RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740 +SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740 +MD5 4cc68d37ed3a3191bb78a14630e14c64 hunspell_UNO_1.1.tar.gz 13774 +RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 hunspell_UNO_1.1.tar.gz 13774 +SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell_UNO_1.1.tar.gz 13774 +MD5 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757 +RMD160 f8010300e50e1c43942e6a84a3b526738edb4ed5 libwpd-0.8.3.tar.gz 482757 +SHA256 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c libwpd-0.8.3.tar.gz 482757 +MD5 950cd200241f04d7ad3a323d71c6e728 oob680-m5-binfilter.tar.bz2 17369994 +RMD160 4fc8b03eb824e4a243e59ed53957503220c9fbd9 oob680-m5-binfilter.tar.bz2 17369994 +SHA256 61a9ce1f95524df9d38dc5930533d334142801d78b80f590844cb3b0c02ea001 oob680-m5-binfilter.tar.bz2 17369994 +MD5 2552ae0ca0405a36da30d0e05a513b0e oob680-m5-core.tar.bz2 108773068 +RMD160 1d9d8bfce6fef329e77fc1cb0de3add5cacd45b0 oob680-m5-core.tar.bz2 108773068 +SHA256 c852ba685fbac85f7c0d8cee4427887322433040991d8e5c43dbc3fb641acfc4 oob680-m5-core.tar.bz2 108773068 +MD5 70797bcf786735b56add111632894589 oob680-m5-lang.tar.bz2 58139196 +RMD160 b5fed4703193f28bc7de3c9ca04d54b19668dfa3 oob680-m5-lang.tar.bz2 58139196 +SHA256 b9182456aa09614cf315839e760c745b3144e80c0659111e00d3e8b24c5b9455 oob680-m5-lang.tar.bz2 58139196 +MD5 6dc29fa3d50351d9b82ef239c1e7aaff oob680-m5-system.tar.bz2 25706992 +RMD160 826fc1148e9efb6b1a493df5583867c19a778314 oob680-m5-system.tar.bz2 25706992 +SHA256 7acb13e7f37fc6d5b61529b383be9099264f76c15e8cf62657db67e2c4b694d0 oob680-m5-system.tar.bz2 25706992 +MD5 cc5b39d1d768cc507b2aad71bf854cb8 ooo-build-oob680.5.0.tar.gz 5092868 +RMD160 eac2f318d0adaadc294315ba3647c55b1e4a321c ooo-build-oob680.5.0.tar.gz 5092868 +SHA256 a8e81644f6c17954c48a95bf689cdb966ccad0833119ca2042661ffe269c5b07 ooo-build-oob680.5.0.tar.gz 5092868 +MD5 0395e6e7da27c1cea7e1852286f6ccf9 xt-20051206-src-only.zip 423516 +RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d xt-20051206-src-only.zip 423516 +SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e xt-20051206-src-only.zip 423516 diff --git a/app-office/openoffice/openoffice-2.0.2_rc3-r1.ebuild b/app-office/openoffice/openoffice-2.0.2_rc4.ebuild index e9c948fe90a3..b289cec4b932 100644 --- a/app-office/openoffice/openoffice-2.0.2_rc3-r1.ebuild +++ b/app-office/openoffice/openoffice-2.0.2_rc4.ebuild @@ -1,15 +1,15 @@ # 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.2_rc3-r1.ebuild,v 1.2 2006/03/02 09:55:07 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2_rc4.ebuild,v 1.1 2006/03/04 06:24:52 suka Exp $ inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs IUSE="binfilter cairo curl eds firefox gnome gtk java kde ldap mozilla xml2" -MY_PV="${PV/_rc3/}" -MY_PV2="oob680.3.0" +MY_PV="${PV/_rc4/}" +MY_PV2="oob680.5.0" PATCHLEVEL="OOB680" -SRC="oob680-m3" +SRC="oob680-m5" S="${WORKDIR}/ooo-build-${MY_PV2}" CONFFILE="${S}/distro-configs/Gentoo.conf.in" DESCRIPTION="OpenOffice.org, a full office productivity suite." |