diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2008-03-28 21:50:43 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2008-03-28 21:50:43 +0000 |
| commit | 37a7003195d80e14ae1ced693e09683d9cfd4480 (patch) | |
| tree | 05cd550067deac63ab811fb33bedfed519ccba22 | |
| parent | amd64 stable, bug #207626 (diff) | |
| download | historical-37a7003195d80e14ae1ced693e09683d9cfd4480.tar.gz historical-37a7003195d80e14ae1ced693e09683d9cfd4480.tar.bz2 historical-37a7003195d80e14ae1ced693e09683d9cfd4480.zip | |
Fix up patch, closes bug #215215
Package-Manager: portage-2.1.4.4
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/Manifest | 4 | ||||
| -rw-r--r-- | app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff | 11 |
3 files changed, 7 insertions, 14 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 2667a50acd85..97c011a63806 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.383 2008/03/28 13:02:05 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.384 2008/03/28 21:50:42 suka Exp $ + + 28 Mar 2008; Andreas Proschofsky <suka@gentoo.org> + files/2.4.0/gentoo-2.4.0.diff: + Fix up patch, closes bug #215215 28 Mar 2008; Andreas Proschofsky <suka@gentoo.org> openoffice-2.4.0.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 80fce9d9fc4f..c7713ba82c19 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -5,7 +5,7 @@ AUX 2.3.1/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e S AUX 2.3.1/regcompapply.diff 312 RMD160 6f92774febf7a78091f2eddf2f589d271f155864 SHA1 a9328d636b94416d9a7ffdd6aa8a94d1cca77aeb SHA256 e6245f28282c5a43bca1c127f2622cf4ea5726bc5761c3d3a7be3dd0bf6068a8 AUX 2.3.1/stlport-ppc-buildfix-apply.diff 257 RMD160 777695a68b975bf3a584d5f125dfdc16d584a955 SHA1 f3e0df039c00881b02741afceada9676030b4c4e SHA256 dbe5d331fdf44964098791034164b61c2d4911066cd538c8908ca908dfd66da3 AUX 2.3.1/stlport-ppc-buildfix.diff 2192 RMD160 9f1b5be42101f0abbc0be98570643cb42fe74246 SHA1 d6ad0f4a73778f7d0c29a65c004d8f2c962bce5b SHA256 979ef2431fd40e3142b4213370bd16c7f6b99ff49d43d572164c1b43adba1b1f -AUX 2.4.0/gentoo-2.4.0.diff 488 RMD160 421891b9734c8c6dcc77fc87912da845b0194537 SHA1 ca543e50904ee661c522af78978ab073fa3f117f SHA256 291d2f4eb6fd63a7b3bcdf94e365d8dd4e538ba3f4e486f953e71c79bde61cb9 +AUX 2.4.0/gentoo-2.4.0.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a AUX 2.4.0/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1 DIST OOo_2.3.1_src_binfilter.tar.bz2 6476673 RMD160 497aec1de49ea941ab8305331a9fc9e8e04a5162 SHA1 0643c52da3850a164928342e7651897b7a76ca1f SHA256 9a76f8eae3dd546f42db883c12f8f21823e0e28ed6d43e83871dd1c1e07fff57 DIST OOo_2.3.1_src_core.tar.bz2 144156134 RMD160 ab75c022d00ed6269eb9437f9c022e44181c6d3a SHA1 de189e03a329cdd334823a52b800fad0c033ab4d SHA256 4c807dd262eb714397de9e78d244d587968a92142a917dbb47f5180c40db6753 @@ -31,5 +31,5 @@ DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f880 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e EBUILD openoffice-2.3.1-r1.ebuild 12385 RMD160 15cc21255d3cedf5b16019faf8dcd7d52055b8a9 SHA1 f74bec8f21572caa6eded91662b6c977f2223539 SHA256 e3b877db697ac97d8e1dc12291deab4b25c97343ed8041a30b1b4f8bb322da92 EBUILD openoffice-2.4.0.ebuild 12131 RMD160 6604acadb1861f73bcdb6e5a6c7cf4c4543bf8d5 SHA1 e7290f69c3d1f14a81bdaec88e2cb9489db1bd17 SHA256 2f649442ffe17161d57168385059d3e585bf793410ecf2466e6501b74400a50a -MISC ChangeLog 79609 RMD160 6febcc0192948ef098c5cb60e3c6add4f2e707f4 SHA1 418ee5d2be655fdd3dc9e57de3a77fc168764258 SHA256 1699c20c8bcc2dc53e4a56c8f8a5686ae74946e60e67592fcd6f241c38deee3a +MISC ChangeLog 79731 RMD160 b1f6fd0b87d53f52bf5df5b00dc7101c7880a37c SHA1 8457a346994f641c7f07731ecd32acdd1013e08a SHA256 cd4fe9d391288c42797f893a11bc6a18f535f35d33c581276d0ba211765e82c8 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 diff --git a/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff b/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff index 626d5a334875..4714b0abb0a2 100644 --- a/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff +++ b/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff @@ -8,15 +8,4 @@ $OOINSTBASE/program/soffice $2 "\$@" EOT chmod 755 $1 ---- configure.in -+++ configure.in -@@ -1077,7 +1077,7 @@ - UPSTREAM_VERSION=2.3.0 - elif test "$with_tag" = "OOG680_m9" ; then - UPSTREAM_VERSION=2.3.1 --elif test "$with_tag" = "OOH680_m11" ; then -+elif test "$with_tag" = "OOH680_m12" ; then - UPSTREAM_VERSION=2.4.0 - fi - if test -n "$UPSTREAM_VERSION"; then |