Fix copy statement for splash, see bug #149127

Package-Manager: portage-2.1.2_pre1-r4

3 files changed, 18 insertions, 12 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/Manifest b/app-office/openoffice/Manifest
index ceb9da8f6617..c6f86c38141e 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -25,18 +25,18 @@ DIST ooo-build-2.0.3.0.tar.gz 5158406 RMD160 45eb102b17f4b55b1b44f0eb08a933b75b9
 DIST ooo-build-ood680-m4.tar.gz 4349611 RMD160 7c21d2df4cd08542e12f0b98bbce3403f37b5cbf SHA1 6aeee510f15379f4f42a810a633fc6feea0e9fb9 SHA256 668c654b7d73a44d19c6529b6cdc5b6a8f3dcdad0fdee4a56dbef56c43a2214d
 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.3.ebuild 9285 RMD160 cb582bc53ac6b7a207f2132917b6ee7a0efe01f9 SHA1 ed0a8b0c3aaa592c734dbec9ff0f2452be65fbe1 SHA256 0ae99dd6369774fce3d87c0dbe9df537340d6c263d57c0b3b68569a9b332bb07
-MD5 486b74a163db2e1692fcedb1aa833778 openoffice-2.0.3.ebuild 9285
-RMD160 cb582bc53ac6b7a207f2132917b6ee7a0efe01f9 openoffice-2.0.3.ebuild 9285
-SHA256 0ae99dd6369774fce3d87c0dbe9df537340d6c263d57c0b3b68569a9b332bb07 openoffice-2.0.3.ebuild 9285
+EBUILD openoffice-2.0.3.ebuild 9309 RMD160 80d3a957812c6ee557dbdcf1ca636257763166f2 SHA1 4edf0ae3c61ce342952411ebfc75bec34e5b78d4 SHA256 a9062e40fcf06f87914e6cf5e75b9c0e3809f9cb6ac8d993ed7ec96d5a97d9cc
+MD5 0768adad0643bcd955ae3a99add5c027 openoffice-2.0.3.ebuild 9309
+RMD160 80d3a957812c6ee557dbdcf1ca636257763166f2 openoffice-2.0.3.ebuild 9309
+SHA256 a9062e40fcf06f87914e6cf5e75b9c0e3809f9cb6ac8d993ed7ec96d5a97d9cc openoffice-2.0.3.ebuild 9309
 EBUILD openoffice-2.0.4_rc2.ebuild 9694 RMD160 1b31266034c638875bcc4671caadc6a5c6c61b48 SHA1 2f414d86391a90cf5b256a4ce48396abb81de97c SHA256 cdcc2cd22de9d8fcc5cdbf02ab21d2216f475449f8c69c22cf4edfdff6df27f3
 MD5 9f53a48dd23e39e8b73ec9ebca9f43e0 openoffice-2.0.4_rc2.ebuild 9694
 RMD160 1b31266034c638875bcc4671caadc6a5c6c61b48 openoffice-2.0.4_rc2.ebuild 9694
 SHA256 cdcc2cd22de9d8fcc5cdbf02ab21d2216f475449f8c69c22cf4edfdff6df27f3 openoffice-2.0.4_rc2.ebuild 9694
-MISC ChangeLog 54191 RMD160 c49f00be4b81e58b83f758b4ec435348e6651cd2 SHA1 a8926f2caba4140b09247e0608c7085a962838d0 SHA256 f09b3e551da1bd40f6a8cb69d34b4dc83e999141c60e1da0b207a8f9b0fc98b0
-MD5 c4e87ec3485668af772ee21c845a945c ChangeLog 54191
-RMD160 c49f00be4b81e58b83f758b4ec435348e6651cd2 ChangeLog 54191
-SHA256 f09b3e551da1bd40f6a8cb69d34b4dc83e999141c60e1da0b207a8f9b0fc98b0 ChangeLog 54191
+MISC ChangeLog 54321 RMD160 161fc4b69c65e5daa5ad403397352d536d68f5ab SHA1 a72c1ad71b1d28eb59e79c7193b9b8b5b3097529 SHA256 79047d0e8538665f76937ba47bf1b56f896f1c9e49d7995fb8286262f51ca1c4
+MD5 b294fb38232461d6478f026900fb326c ChangeLog 54321
+RMD160 161fc4b69c65e5daa5ad403397352d536d68f5ab ChangeLog 54321
+SHA256 79047d0e8538665f76937ba47bf1b56f896f1c9e49d7995fb8286262f51ca1c4 ChangeLog 54321
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
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}