From: Andreas Proschofsky Date: Tue, 23 Jan 2007 12:50:07 +0000 (+0000) Subject: Silent bump to ooo-build-2.1.1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c20decafdb9eb6871dcf42d5f3b94a36c9ec2e58;p=gentoo.git Silent bump to ooo-build-2.1.1 Package-Manager: portage-2.1.2-r2 --- diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 6ab9b22848b0..d07dcb80e219 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.297 2007/01/14 16:31:41 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.298 2007/01/23 12:50:06 suka Exp $ + + 23 Jan 2007; Andreas Proschofsky + -files/2.1.0/config_with-seamonkey.diff, + -files/2.1.0/disable_cxxhelplinker.diff, files/2.1.0/gentoo-2.1.0.diff, + openoffice-2.1.0.ebuild: + Silent bump to ooo-build-2.1.1, obsoleting some of our patches 14 Jan 2007; Andreas Proschofsky files/2.1.0/gentoo-2.1.0.diff, +files/2.1.0/config_with-seamonkey.diff, diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 8c332b23dbea..56c6c730897a 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -14,18 +14,10 @@ AUX 2.0.4/regcompapply.diff 319 RMD160 c46130cf0c466dc7c4b82f7235b0009b39476752 MD5 cb8c7bad3c931b6b7990cffd484a4cae files/2.0.4/regcompapply.diff 319 RMD160 c46130cf0c466dc7c4b82f7235b0009b39476752 files/2.0.4/regcompapply.diff 319 SHA256 6886083c9de0493f0b3a68b8d1f329ed3927360d989ff1d15916f12c7842cadd files/2.0.4/regcompapply.diff 319 -AUX 2.1.0/config_with-seamonkey.diff 1055 RMD160 faa7d8f8213a2ab547698d6c67791669b10d03d1 SHA1 f0d90029714746b86ef3e23b638cb92984eae994 SHA256 44239e248d3b9c654a263ec50127252ea6b4f3589ae8675f2a1ac83fa87fb48e -MD5 1b5cbbd6cbf4231e8df1ec3aed9c2213 files/2.1.0/config_with-seamonkey.diff 1055 -RMD160 faa7d8f8213a2ab547698d6c67791669b10d03d1 files/2.1.0/config_with-seamonkey.diff 1055 -SHA256 44239e248d3b9c654a263ec50127252ea6b4f3589ae8675f2a1ac83fa87fb48e files/2.1.0/config_with-seamonkey.diff 1055 -AUX 2.1.0/disable_cxxhelplinker.diff 552 RMD160 0e1bab8bf25da2ef5ed89b792fce1cddbad870ad SHA1 b879b5f1537ee221cf75fe24315d9ff5dd2ea990 SHA256 e90cc8cf380296f69bc517b461926d8d8f4a44867085a16744ab482314f14a0b -MD5 15e8fd7a42092e321e2a01903014d050 files/2.1.0/disable_cxxhelplinker.diff 552 -RMD160 0e1bab8bf25da2ef5ed89b792fce1cddbad870ad files/2.1.0/disable_cxxhelplinker.diff 552 -SHA256 e90cc8cf380296f69bc517b461926d8d8f4a44867085a16744ab482314f14a0b files/2.1.0/disable_cxxhelplinker.diff 552 -AUX 2.1.0/gentoo-2.1.0.diff 539 RMD160 892e94a33bd0c67709a40027509965bb4805d093 SHA1 eec6ec1a5b38e4529be7dde88cf68bdb29892b0d SHA256 b7a7c11fccd04b88af8d4a161358829f5667499a783a784bdb376f2c280f11f4 -MD5 30b46fd232dc210a15a31bf9735be002 files/2.1.0/gentoo-2.1.0.diff 539 -RMD160 892e94a33bd0c67709a40027509965bb4805d093 files/2.1.0/gentoo-2.1.0.diff 539 -SHA256 b7a7c11fccd04b88af8d4a161358829f5667499a783a784bdb376f2c280f11f4 files/2.1.0/gentoo-2.1.0.diff 539 +AUX 2.1.0/gentoo-2.1.0.diff 181 RMD160 8ac1700851de1216bf6c342fd697d65d123b13ae SHA1 d88a87f0e53d84ccb7102a4beb2d5fba8fba2a2a SHA256 c0bcfd92976525c66f9e77a728c1dc71c8f09712177af9454d286082ba6e3d8d +MD5 0ac100c746d44b8f92d7034cf41db54b files/2.1.0/gentoo-2.1.0.diff 181 +RMD160 8ac1700851de1216bf6c342fd697d65d123b13ae files/2.1.0/gentoo-2.1.0.diff 181 +SHA256 c0bcfd92976525c66f9e77a728c1dc71c8f09712177af9454d286082ba6e3d8d files/2.1.0/gentoo-2.1.0.diff 181 AUX 2.1.0/ooo-wrapper.in 2650 RMD160 081f34f44be85f13224b59c7199fa27265563760 SHA1 77654213fbc2f1ef20e2a76b4bc87230865036c8 SHA256 ec974e0323c7cf89bea75f56ccc6db2fd90b2be45e676851ea62d7130defcdce MD5 3998f6afdb1e322b138d3d1c65449866 files/2.1.0/ooo-wrapper.in 2650 RMD160 081f34f44be85f13224b59c7199fa27265563760 files/2.1.0/ooo-wrapper.in 2650 @@ -47,21 +39,21 @@ DIST extras-2.tar.bz2 94740 RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd SHA1 DIST hunspell_UNO_1.1.tar.gz 13774 RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 SHA1 d72420069de87062b3e5b4f45235a7bc2c1e124a SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 DIST lp_solve_5.5.tar.gz 495452 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 SHA1 1cb19a392a4b3370adc3513964f7a351ad605875 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 DIST ooo-build-2.0.4.11.tar.gz 4675395 RMD160 73f7f981f3d4a15f879bbd8cc41d1690be4d6dd7 SHA1 102c4df8e14a95bbf410c0364089d39c4f70e563 SHA256 f3164e2242fa8bbe4e196bcac8c9ab332f33542940c3677d58bd13fc3a3c55ca -DIST ooo-build-2.1.tar.gz 4034756 RMD160 8acf5e0276a878c33762365434c8753a45765233 SHA1 02a3857fb18b5b60d5f946a2bf6c9c90defd3f23 SHA256 02bdf2c8b3fa02cabfdb8aa74a2d0f194d5488c504afb1019d720ed5ce38b4ac +DIST ooo-build-2.1.1.tar.gz 4130367 RMD160 27c326759609d4832f6424e15e08a9b64e05d804 SHA1 e39aeeb2f881a9a97cb59991288e0182f1e6617a SHA256 b46210888fdf04e2286f6e6e1e3a4d32f71ecb4e77010ed734f19ba1d3682db9 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.4.ebuild 9992 RMD160 c22b6f7169f61187731cd215ad8013875cd9d939 SHA1 6274c01b2565b6ae6f54611989a7774b474c3c71 SHA256 20aacdfc804f5458abc42d521b07068485ba648481266cc8eceb892ad19d869a MD5 ae7ccc1a160003a2f290036b79af9076 openoffice-2.0.4.ebuild 9992 RMD160 c22b6f7169f61187731cd215ad8013875cd9d939 openoffice-2.0.4.ebuild 9992 SHA256 20aacdfc804f5458abc42d521b07068485ba648481266cc8eceb892ad19d869a openoffice-2.0.4.ebuild 9992 -EBUILD openoffice-2.1.0.ebuild 11535 RMD160 2ba48e6a8eeda222f18c202480fb460922d345df SHA1 81b790bc4eb60dc07b84e626c60ed884c9834bab SHA256 f17150f2d555ab37cbab8ae0ffe825ecaeee7e5afaee8abe071de9cdf2a4be53 -MD5 5f4d4205a8d2905e696627029430c55a openoffice-2.1.0.ebuild 11535 -RMD160 2ba48e6a8eeda222f18c202480fb460922d345df openoffice-2.1.0.ebuild 11535 -SHA256 f17150f2d555ab37cbab8ae0ffe825ecaeee7e5afaee8abe071de9cdf2a4be53 openoffice-2.1.0.ebuild 11535 -MISC ChangeLog 62011 RMD160 e11a30bd57845337c709558d83fcb7d456ec5bc9 SHA1 df9dd05c2b03b52590e632fab05e4c1df93b6b46 SHA256 26ebb6e9d8924f8385f03e20507b5499c3e4ddf66f36026774ca0d0e867bbbf6 -MD5 72fa1bd5caa903a26ea3a27c061371b4 ChangeLog 62011 -RMD160 e11a30bd57845337c709558d83fcb7d456ec5bc9 ChangeLog 62011 -SHA256 26ebb6e9d8924f8385f03e20507b5499c3e4ddf66f36026774ca0d0e867bbbf6 ChangeLog 62011 +EBUILD openoffice-2.1.0.ebuild 11392 RMD160 aca7293ad7df6451e3b565668e22e6d1f2c02d50 SHA1 055cc7945398c82468864ed5bf08dd11837db022 SHA256 41ec97a57bc3f636b0133b270a8033da578b9a0baaa53b98400040831cc9cab9 +MD5 f625bc9c59b714153811010971bf81e5 openoffice-2.1.0.ebuild 11392 +RMD160 aca7293ad7df6451e3b565668e22e6d1f2c02d50 openoffice-2.1.0.ebuild 11392 +SHA256 41ec97a57bc3f636b0133b270a8033da578b9a0baaa53b98400040831cc9cab9 openoffice-2.1.0.ebuild 11392 +MISC ChangeLog 62274 RMD160 a038e13d1d24d0ca57755901c71d96080621226d SHA1 0a1580b9302d2f4a1681171ea25cbb2040340fe8 SHA256 614cb26b7411c21a3c64a133f9e70a246dbb2ee066aae8c9014e2aaa228d2983 +MD5 75136d2d691230992648a3a8819dd046 ChangeLog 62274 +RMD160 a038e13d1d24d0ca57755901c71d96080621226d ChangeLog 62274 +SHA256 614cb26b7411c21a3c64a133f9e70a246dbb2ee066aae8c9014e2aaa228d2983 ChangeLog 62274 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461 @@ -69,6 +61,6 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata 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 -MD5 318a5cc7bae4bfca4526a0f8cd48a653 files/digest-openoffice-2.1.0 2714 -RMD160 dd30d937a7ede64ed422c7579d91929d06afe7da files/digest-openoffice-2.1.0 2714 -SHA256 32f76ab4627dfbe88bb9112395b09a799945b4544026d42c76a6c3f94c0f3f7d files/digest-openoffice-2.1.0 2714 +MD5 2594f3e569a9a105b7fdfd776bfa282d files/digest-openoffice-2.1.0 2720 +RMD160 15631224ba8fdadab51250909cdfcd64c32a4c80 files/digest-openoffice-2.1.0 2720 +SHA256 8c58a596600a947d69be4ebda571a6462d55bb8429d7f7d56fc060d4d45285f4 files/digest-openoffice-2.1.0 2720 diff --git a/app-office/openoffice/files/2.1.0/config_with-seamonkey.diff b/app-office/openoffice/files/2.1.0/config_with-seamonkey.diff deleted file mode 100644 index 423e49e89cb8..000000000000 --- a/app-office/openoffice/files/2.1.0/config_with-seamonkey.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- config_office/configure.in.orig 2007-01-13 14:18:26.000000000 +0100 -+++ config_office/configure.in 2007-01-13 14:20:11.000000000 +0100 -@@ -58,6 +58,10 @@ - [ --with-firefox Use Firefox instead of Mozilla Suite for building. - Only honoured with --with-system-mozilla - ],,) -+AC_ARG_WITH(seamonkey, -+[ --with-seamonkey Use Seamonkey instead of Mozilla Suite for building. -+ Only honoured with --with-system-mozilla -+],,) - AC_ARG_WITH(xulrunner, - [ --with-xulrunner Use XULRunner instead of Mozilla Suite for building. - Only honoured with --with-system-mozilla -@@ -3714,6 +3718,8 @@ - AC_MSG_CHECKING([which Mozilla flavour to use]) - if test -n "$with_firefox" && test "$with_firefox" != "no"; then - MOZ_FLAVOUR=firefox -+ elif test -n "$with_seamonkey" && test "$with_seamonkey" != "no"; then -+ MOZ_FLAVOUR=seamonkey - elif test -n "$with_xulrunner" && test "$with_xulrunner" != "no"; then - MOZ_FLAVOUR=xulrunner - else diff --git a/app-office/openoffice/files/2.1.0/disable_cxxhelplinker.diff b/app-office/openoffice/files/2.1.0/disable_cxxhelplinker.diff deleted file mode 100644 index dce712b45e0a..000000000000 --- a/app-office/openoffice/files/2.1.0/disable_cxxhelplinker.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- patches/src680/apply -+++ patches/src680/apply -@@ -73,7 +73,7 @@ - Frugalware64: FrugalwareBase, 64bit - QiLinux: LinuxCommon, GlobalDesktopFiles, FilePickers - #Gentoo --GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, SystemJavaBits, CairoFonts, CXXHelpLinker, ICU36, BerkeleyDB43, STLport5 -+GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, SystemJavaBits, CairoFonts, ICU36, BerkeleyDB43, STLport5 - GentooUnstable: GentooBase, GentooExperimental, 64bit - Gentoo : GentooBase - Gentoo64: GentooBase, 64bit - diff --git a/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff b/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff index d4f624b7c7ab..b911c448b251 100644 --- a/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff +++ b/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff @@ -8,14 +8,3 @@ EOT chmod 755 $1 } ---- patches/src680/apply -+++ patches/src680/apply -@@ -812,6 +816,8 @@ - # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken, n#195272 - libxmlsec-system-nss.diff, i#69368, pmladek - -+# add --with-seamonkey configure flag to link with seamonkey-*.pc -+config_with-seamonkey.diff, i#73440, hmth - - [ MandrivaOnly ] - SectionOwner => gghibo diff --git a/app-office/openoffice/files/digest-openoffice-2.1.0 b/app-office/openoffice/files/digest-openoffice-2.1.0 index b6e974637e64..1b00fc65ee91 100644 --- a/app-office/openoffice/files/digest-openoffice-2.1.0 +++ b/app-office/openoffice/files/digest-openoffice-2.1.0 @@ -22,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 a9b1b3876a804251656374b92dd9e4f0 ooo-build-2.1.tar.gz 4034756 -RMD160 8acf5e0276a878c33762365434c8753a45765233 ooo-build-2.1.tar.gz 4034756 -SHA256 02bdf2c8b3fa02cabfdb8aa74a2d0f194d5488c504afb1019d720ed5ce38b4ac ooo-build-2.1.tar.gz 4034756 +MD5 e5c3f8d4f259a4621adbaaabe1eb9000 ooo-build-2.1.1.tar.gz 4130367 +RMD160 27c326759609d4832f6424e15e08a9b64e05d804 ooo-build-2.1.1.tar.gz 4130367 +SHA256 b46210888fdf04e2286f6e6e1e3a4d32f71ecb4e77010ed734f19ba1d3682db9 ooo-build-2.1.1.tar.gz 4130367 MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144 SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144 diff --git a/app-office/openoffice/openoffice-2.1.0.ebuild b/app-office/openoffice/openoffice-2.1.0.ebuild index 8824c6e8979c..0fd53a6c01d9 100644 --- a/app-office/openoffice/openoffice-2.1.0.ebuild +++ b/app-office/openoffice/openoffice-2.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.10 2007/01/14 16:31:41 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.11 2007/01/23 12:50:06 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -9,7 +9,7 @@ inherit check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functi IUSE="binfilter branding cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap sound odk pam seamonkey webdav" -MY_PV="2.1" +MY_PV="2.1.1" PATCHLEVEL="OOE680" SRC="OOo_${PV}_src" S="${WORKDIR}/ooo" @@ -198,9 +198,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff epatch ${FILESDIR}/${PV}/wrapper-readd.diff - use !java && epatch ${FILESDIR}/${PV}/disable_cxxhelplinker.diff cp -f ${FILESDIR}/${PV}/ooo-wrapper.in ${S}/bin || die - cp -f ${FILESDIR}/${PV}/config_with-seamonkey.diff ${S}/patches/src680 || die #Use flag checks if use java ; then