summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2006-09-28 16:47:49 +0000
committerAndreas Proschofsky <suka@gentoo.org>2006-09-28 16:47:49 +0000
commita59c3f7ace7c326fa17d2daf9bb7d09e50c7fb60 (patch)
tree89270b9aca80aca79fee03db33c515727db58013 /app-office/openoffice
parentAdded description for Tomcat's new admin local use flag. (diff)
downloadgentoo-2-a59c3f7ace7c326fa17d2daf9bb7d09e50c7fb60.tar.gz
gentoo-2-a59c3f7ace7c326fa17d2daf9bb7d09e50c7fb60.tar.bz2
gentoo-2-a59c3f7ace7c326fa17d2daf9bb7d09e50c7fb60.zip
Fix copy statement for splash, see bug #149127
(Portage version: 2.1.2_pre1-r4)
Diffstat (limited to 'app-office/openoffice')
-rw-r--r--app-office/openoffice/ChangeLog6
-rw-r--r--app-office/openoffice/openoffice-2.0.3.ebuild8
2 files changed, 10 insertions, 4 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index c1acf1410c99..13eccc1d4737 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
# 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.256 2006/09/22 16:39:32 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.257 2006/09/28 16:47:49 suka Exp $
+
+ 28 Sep 2006; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-2.0.3.ebuild:
+ Fix copy statement for splash, see bug #149127
*openoffice-2.0.4_rc2 (22 Sep 2006)
diff --git a/app-office/openoffice/openoffice-2.0.3.ebuild b/app-office/openoffice/openoffice-2.0.3.ebuild
index 6aab2b75f6a4..ef6b5d407154 100644
--- a/app-office/openoffice/openoffice-2.0.3.ebuild
+++ b/app-office/openoffice/openoffice-2.0.3.ebuild
@@ -1,6 +1,6 @@
# 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.3.ebuild,v 1.13 2006/09/15 11:21:47 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.3.ebuild,v 1.14 2006/09/28 16:47:49 suka Exp $
inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg kde-functions mono toolchain-funcs
@@ -54,7 +54,9 @@ RDEPEND="!app-office/openoffice-bin
>=x11-libs/gtk+-2.8 )
eds? ( >=gnome-extra/evolution-data-server-1.2 )
kde? ( >=kde-base/kdelibs-3.2 )
- firefox? ( >=www-client/mozilla-firefox-1.5-r9 )
+ firefox? ( >=www-client/mozilla-firefox-1.5-r9
+ >=dev-libs/nspr-4.6.2
+ >=dev-libs/nss-3.11-r1 )
>=x11-libs/startup-notification-0.5
>=media-libs/freetype-2.1.10-r2
>=media-libs/fontconfig-2.2.0
@@ -177,7 +179,7 @@ src_unpack() {
epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
#We redirect SRCDIR so we have to copy this over
- cp -fR ${S}/src/* ${PORTAGE_TMPDIR}/portage/${P}/distdir/ || die
+ cp -fR "${S}"/src/* "${DISTDIR}" || die
#Use flag checks
use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}