summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2004-05-07 20:50:04 +0000
committerAndreas Proschofsky <suka@gentoo.org>2004-05-07 20:50:04 +0000
commita7f1a8106e43c5629fb4a049100d00a92263e270 (patch)
tree88ffc7ec55848b533f2feff2c605254875472ff3 /app-office
parentAdd IUSE=, stable on x86 (diff)
downloadhistorical-a7f1a8106e43c5629fb4a049100d00a92263e270.tar.gz
historical-a7f1a8106e43c5629fb4a049100d00a92263e270.tar.bz2
historical-a7f1a8106e43c5629fb4a049100d00a92263e270.zip
put the kde splash screen in place, also some cleanups
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice-ximian/Manifest2
-rw-r--r--app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild17
2 files changed, 7 insertions, 12 deletions
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index c5129d8d4f51..d0eaf588a2a0 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,5 +1,5 @@
MD5 52e27b9b0c1d0fe5aeb780ee95d688a3 openoffice-ximian-1.1.53.ebuild 14861
-MD5 620d3e07692ce83e4cddb976d896c06c openoffice-ximian-1.1.55-r1.ebuild 15409
+MD5 1799ceaa43daed54b1dc0465c9b6eadb openoffice-ximian-1.1.55-r1.ebuild 15437
MD5 665131dd815e781e7fb75a405e7c8c11 openoffice-ximian-1.1.51-r1.ebuild 15080
MD5 5a8067cff008bb262faf659be4f79d03 openoffice-ximian-1.1.55.ebuild 14965
MD5 306123f155769cc00478ece73816167b openoffice-ximian-1.1.54.ebuild 14856
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild
index 15f7a9eb2fd1..786466c258dc 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild,v 1.1 2004/05/07 15:30:49 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild,v 1.2 2004/05/07 20:50:04 suka Exp $
# IMPORTANT: This is extremely alpha!!!
@@ -249,7 +249,6 @@ src_unpack() {
epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch
fi
- einfo "Applying Ximian OO.org Patches"
if [ `use ooo-kde` ]; then
DISTRO=KDE
ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER}
@@ -258,12 +257,16 @@ src_unpack() {
ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
fi
+ einfo "Applying Ximian OO.org Patches"
${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=${DISTRO} || die "Ximian patches failed"
einfo "Installing / Scaling Icons"
${PATCHDIR}/bin/scale-icons ${S}
cp -avf ${ICONDIR}/* ${S}
+ einfo "Copying splash screens in place"
+ cp ${PATCHDIR}/src/open*.bmp ${S}/offmgr/res/
+
einfo "Munging font mappings ..."
${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu
echo "done munging fonts."
@@ -313,10 +316,6 @@ src_compile() {
addpredict /root/.gconfd
local buildcmd=""
- set_languages
-
- oo_setup
-
# dmake security patch
cd ${S}/dmake
autoconf || die
@@ -386,8 +385,6 @@ src_install() {
addpredict "/usr/bin/soffice"
addpredict "/pspfontcache"
- set_languages
-
get_EnvSet
# The install part should now be relatively OK compared to
@@ -504,9 +501,7 @@ src_install() {
rm -rf ${D}${INSTDIR}/share/cde
# Make sure these do not get nuked.
- keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb}
- keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
- keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
+ keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb} ${INSTDIR}/user/psprint/{driver,fontmetric} ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
}
pkg_postinst() {