summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2008-03-28 21:50:43 +0000
committerAndreas Proschofsky <suka@gentoo.org>2008-03-28 21:50:43 +0000
commit8cfce4c6077d7243be422e740550a34201491bb4 (patch)
tree82a73e4e92017775d60cb4a288dcb620a579f772
parentamd64 stable, bug #207626 (diff)
downloadgentoo-2-8cfce4c6077d7243be422e740550a34201491bb4.tar.gz
gentoo-2-8cfce4c6077d7243be422e740550a34201491bb4.tar.bz2
gentoo-2-8cfce4c6077d7243be422e740550a34201491bb4.zip
Fix up patch, closes bug #215215
(Portage version: 2.1.4.4)
-rw-r--r--app-office/openoffice/ChangeLog6
-rw-r--r--app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff11
2 files changed, 5 insertions, 12 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/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