summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <msterret@gentoo.org>2003-09-06 22:23:41 +0000
committerMichael Sterrett <msterret@gentoo.org>2003-09-06 22:23:41 +0000
commit8f5142ea9ceeb00cdd1e277d40d247511ba34a8a (patch)
treedb09e00b77544a404c21b25ea239a9a054c39580 /app-office/openoffice
parentUpdate version (diff)
downloadgentoo-2-8f5142ea9ceeb00cdd1e277d40d247511ba34a8a.tar.gz
gentoo-2-8f5142ea9ceeb00cdd1e277d40d247511ba34a8a.tar.bz2
gentoo-2-8f5142ea9ceeb00cdd1e277d40d247511ba34a8a.zip
repoman: trim trailing whitespace
Diffstat (limited to 'app-office/openoffice')
-rw-r--r--app-office/openoffice/Manifest20
-rw-r--r--app-office/openoffice/openoffice-1.0.3-r1.ebuild42
-rw-r--r--app-office/openoffice/openoffice-1.1_beta2-r1.ebuild38
-rw-r--r--app-office/openoffice/openoffice-1.1_rc1.ebuild38
-rw-r--r--app-office/openoffice/openoffice-1.1_rc2.ebuild36
-rw-r--r--app-office/openoffice/openoffice-1.1_rc3.ebuild36
6 files changed, 105 insertions, 105 deletions
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 52ac01b677e9..b3e932f07d85 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,14 +1,18 @@
MD5 d426279aa26aee81f39772b7bd2d7faf ChangeLog 8516
-MD5 ed3b2793bf63134bd69e4d81f2030606 openoffice-1.0.3-r1.ebuild 21734
-MD5 eed99feac64813b7f0f2134863aa9ac9 openoffice-1.1_beta2-r1.ebuild 17184
-MD5 742f19e2ea3dcba440af971a89993724 openoffice-1.1_rc1.ebuild 17024
-MD5 e770016adf95ff3509e0dccac92aee19 openoffice-1.1_rc2.ebuild 19188
-MD5 f55dc8d6a6cebb3cd756e5f8a6b89e54 openoffice-1.1_rc3.ebuild 19386
+MD5 55a70be44ff3c745a1216b9f8ef044d1 openoffice-1.1_rc1.ebuild 16997
+MD5 7fd8b275bffc9899070c2d4ee5fb23d8 openoffice-1.0.3-r1.ebuild 21708
+MD5 a0e98d7a2bf0087c20d16557d8cc2513 openoffice-1.1_beta2-r1.ebuild 17157
+MD5 df39d3ec6066411adef82f967f28c715 openoffice-1.1_rc2.ebuild 19163
+MD5 d46e2cbb6cc1e6c5839f7da9c97e2922 openoffice-1.1_rc3.ebuild 19361
+MD5 a1dde590888590955ae081b2d285866e files/digest-openoffice-1.1_rc1 195
MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r1 330
MD5 595681e533f93f0ffe52a8af67b6953f files/digest-openoffice-1.1_beta2-r1 198
-MD5 a1dde590888590955ae081b2d285866e files/digest-openoffice-1.1_rc1 195
MD5 1c3af7976138950372a09066de8c2825 files/digest-openoffice-1.1_rc2 196
MD5 a6c9d8c5763378f5bae1e4ac50a2ecaf files/digest-openoffice-1.1_rc3 196
+MD5 82ddd83763d3ad994919438e46426294 files/1.1_rc1/newstlportfix.patch 10531
+MD5 8c4fb4616a62d406b5019ce1005d381a files/1.1_rc1/no-mozab.patch 2483
+MD5 9c24ec0c94b795a6b10dae2657631036 files/1.1_rc1/ooffice-wrapper-1.3 8978
+MD5 230737cadf4606928cff18cc26d9b72e files/1.1_rc1/openoffice-xrender.patch 330
MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.3/freetype-2.1.3.patch 1367
MD5 271539dafab707398e9b806eef8f250a files/1.0.3/ooffice-wrapper-1.2 8220
MD5 46080de39ef5acd7488ce1e76ac10cbe files/1.0.3/ooffice-wrapper-1.3 8362
@@ -30,10 +34,6 @@ MD5 82ddd83763d3ad994919438e46426294 files/1.1_beta2/newstlportfix.patch 10531
MD5 306a5f04de5bff97195455b539bd6d14 files/1.1_beta2/no-mozab.patch 2345
MD5 9ded113d20e703977e226bdc8373a6d4 files/1.1_beta2/ooffice-wrapper-1.3 8409
MD5 230737cadf4606928cff18cc26d9b72e files/1.1_beta2/openoffice-xrender.patch 330
-MD5 82ddd83763d3ad994919438e46426294 files/1.1_rc1/newstlportfix.patch 10531
-MD5 8c4fb4616a62d406b5019ce1005d381a files/1.1_rc1/no-mozab.patch 2483
-MD5 9c24ec0c94b795a6b10dae2657631036 files/1.1_rc1/ooffice-wrapper-1.3 8978
-MD5 230737cadf4606928cff18cc26d9b72e files/1.1_rc1/openoffice-xrender.patch 330
MD5 3ccbb09eb3c116bfeffc0f757f6576d2 files/1.1_rc2/newstlportfix.patch 10473
MD5 57bbd107649e40fc1543bb677d53c2eb files/1.1_rc2/no-crashrep.patch 1099
MD5 309ec50c6facc777068caebd51640c92 files/1.1_rc2/no-mozab.patch 2741
diff --git a/app-office/openoffice/openoffice-1.0.3-r1.ebuild b/app-office/openoffice/openoffice-1.0.3-r1.ebuild
index 75d316a20f8e..e2c1ef259dc7 100644
--- a/app-office/openoffice/openoffice-1.0.3-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.3-r1.ebuild,v 1.4 2003/09/04 02:29:34 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.3-r1.ebuild,v 1.5 2003/09/06 22:21:02 msterret Exp $
# IMPORTANT: This is extremely alpha!!!
@@ -188,7 +188,7 @@ pkg_setup() {
eerror "you could do the following:"
eerror
eerror " # export FORCE_JAVA=yes"
- eerror
+ eerror
die
fi
@@ -225,7 +225,7 @@ pkg_setup() {
ewarn " falling back to default value !!! "
ewarn "****************************************************************"
fi
-
+
}
oo_setup() {
@@ -310,7 +310,7 @@ src_unpack() {
# Debian patch to fix an xinteraction handler build error (Seth)
epatch ${FILESDIR}/${PV}/${PN}-1.0.1-xinteraction-fix.patch
-
+
# Get OO to build with freetype-2.1.3
einfo "Moving freetype-${FT_VER}.tar.bz2 in place ..."
cp ${DISTDIR}/freetype-${FT_VER}.tar.bz2 ${S}/freetype/download || die
@@ -320,7 +320,7 @@ src_unpack() {
# OK, copy the new patch in place, and fixup some other things ...
cp ${FILESDIR}/${PV}/freetype-${FT_VER}.patch ${S}/freetype || die
epatch ${FILESDIR}/${PV}/${PN}-1.0.1-use-freetype-${FT_VER}.patch
-
+
# Now for our optimization flags ...
perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
${S}/solenv/inc/unxlngi3.mk
@@ -350,7 +350,7 @@ src_unpack() {
epatch $FILESDIR/${PV}/openoffice-1.0.3-sparc-gentoo.patch
epatch $FILESDIR/${PV}/openoffice-1.0.1-sparc.patch.bz2
fi
-
+
}
get_EnvSet() {
@@ -388,7 +388,7 @@ src_compile() {
export CC="/usr/bin/ccache ${CC}"
export CXX="/usr/bin/ccache ${CXX}"
fi
-
+
# Enable distcc for this build (Az)
if [ "${FEATURES/-distcc/}" = "${FEATURES}" -a \
"${FEATURES/distcc/}" != "${FEATURES}" -a \
@@ -413,13 +413,13 @@ src_compile() {
./configure --enable-gcc3 \
--with-jdk-home=${JAVA_HOME} \
--with-x || die
-
+
cd ${S}
get_EnvSet
# Set language
[ ${LENV} ] && echo "setenv ${LENV} \"true\"" >> ${S}/${LinuxEnvSet}
-
+
# Do not include /usr/include in header search path, and
# same thing for internal gcc include dir, as gcc3 handles
# it correctly by default! (Az)
@@ -445,13 +445,13 @@ src_compile() {
else
buildcmd="${S}/solenv/bin/build.pl -all product=full"
fi
-
+
if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
then
# Set CCCOMP and CXXCOMP. This is still needed for STLport
echo "setenv CCCOMP \"${CC}\"" >> ${S}/${LinuxEnvSet}
echo "setenv CXXCOMP \"${CXX}\"" >> ${S}/${LinuxEnvSet}
- fi
+ fi
if [ "$(gcc-major-version)" -eq 3 ]
then
@@ -520,7 +520,7 @@ src_install() {
${S}/instsetoo/unxlngs.pro/${LANGUAGE}/normal/README
fi
-
+
# The install part should now be relatively OK compared to
# what it was. Basically we use autoresponse files to install
# unattended, running under a Xvfb if needed. Afterwards we
@@ -543,7 +543,7 @@ src_install() {
[JAVA]
JavaSupport=preinstalled_or_none
END_RS
-
+
# Autoresponse file for user isntallation
cat > ${T}/rsfile-local <<-"END_RS"
[ENVIRONMENT]
@@ -593,7 +593,7 @@ src_install() {
insinto /etc/openoffice
sed -e "s|<pv>|${PV}|g" ${T}/rsfile-local > ${T}/autoresponse.conf
doins ${T}/autoresponse.conf
-
+
# Install wrapper script
exeinto /usr/bin
sed -e "s|<pv>|${PV}|g" \
@@ -602,7 +602,7 @@ src_install() {
sed -e "s|/soffice|/spadmin|g" \
${T}/ooffice > ${T}/oopadmin
doexe ${T}/oopadmin
-
+
# Component symlinks
dosym ooffice /usr/bin/oocalc
dosym ooffice /usr/bin/oodraw
@@ -618,7 +618,7 @@ src_install() {
# Install the files needed for the catagory
doins ${D}${INSTDIR}/share/gnome/net/.directory
doins ${D}${INSTDIR}/share/gnome/net/.order
-
+
for x in ${D}${INSTDIR}/share/gnome/net/*.desktop
do
# We have to handle setup differently
@@ -632,10 +632,10 @@ src_install() {
if [ -n "`use kde`" ]
then
local kdeloc="${D}${INSTDIR}/share/kde/net/applnk/OpenOffice.org${PV}"
-
+
# Portage do not work with the space ..
mv ${D}${INSTDIR}/share/kde/net/applnk/OpenOffice.org\ ${PV} ${kdeloc}
-
+
insinto /usr/share/applnk/OpenOffice.org
# Install the files needed for the catagory
doins ${kdeloc}/.directory
@@ -643,7 +643,7 @@ src_install() {
dodir /usr/share
# Install the icons and mime info
cp -a ${D}${INSTDIR}/share/kde/net/mimelnk/share/* ${D}/usr/share
-
+
for x in ${kdeloc}/*.desktop
do
# We have to handle setup differently
@@ -689,7 +689,7 @@ pkg_postinst() {
einfo
einfo " If the fonts appear garbled in the user interface refer to "
einfo " Bug 8539, or http://www.openoffice.org/FAQs/fontguide.html#8"
- einfo
+ einfo
einfo "******************************************************************"
-}
+}
diff --git a/app-office/openoffice/openoffice-1.1_beta2-r1.ebuild b/app-office/openoffice/openoffice-1.1_beta2-r1.ebuild
index 2d595a4c7133..7aad702e78eb 100644
--- a/app-office/openoffice/openoffice-1.1_beta2-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.1_beta2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_beta2-r1.ebuild,v 1.4 2003/08/07 11:44:54 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_beta2-r1.ebuild,v 1.5 2003/09/06 22:21:02 msterret Exp $
# IMPORTANT: This is extremely alpha!!!
@@ -136,7 +136,7 @@ pkg_setup() {
eerror "you could do the following:"
eerror
eerror " # export FORCE_JAVA=yes"
- eerror
+ eerror
die
fi
@@ -165,7 +165,7 @@ oo_setup() {
export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
# Just recheck gcc version ...
- if [ "$(gcc-version)" != "3.2" ]
+ if [ "$(gcc-version)" != "3.2" ]
then
# See if we can get a gcc profile we know is proper ...
if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1 &> /dev/null
@@ -259,8 +259,8 @@ src_compile() {
export CC="/usr/bin/ccache/ccache ${CC}"
export CXX="/usr/bin/ccache/ccache ${CXX}"
fi
-
- # Enable new ccache for this build
+
+ # Enable new ccache for this build
if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \
"${FEATURES/ccache/}" != "${FEATURES}" -a \
-x /usr/bin/ccache ]
@@ -270,7 +270,7 @@ src_compile() {
export CC="/usr/bin/ccache ${CC}"
export CXX="/usr/bin/ccache ${CXX}"
fi
-
+
# Enable distcc for this build (Az)
if [ "${FEATURES/-distcc/}" = "${FEATURES}" -a \
"${FEATURES/distcc/}" != "${FEATURES}" -a \
@@ -295,10 +295,10 @@ src_compile() {
--with-jdk-home=${JAVA_HOME} \
--with-lang=ALL\
--with-x || die
-
+
cd ${S}
get_EnvSet
-
+
# Do not include /usr/include in header search path, and
# same thing for internal gcc include dir, as gcc3 handles
# it correctly by default! (Az)
@@ -324,13 +324,13 @@ src_compile() {
else
buildcmd="${S}/solenv/bin/build.pl -all product=full"
fi
-
+
if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
then
# Set CCCOMP and CXXCOMP. This is still needed for STLport
echo "setenv CCCOMP \"${CC}\"" >> ${S}/${LinuxEnvSet}
echo "setenv CXXCOMP \"${CXX}\"" >> ${S}/${LinuxEnvSet}
- fi
+ fi
if [ "$(gcc-major-version)" -eq 3 ]
then
@@ -380,7 +380,7 @@ src_install() {
addpredict "/share"
addpredict "/dev/dri"
addpredict "/usr/bin/soffice"
- addpredict "/pspfontcache"
+ addpredict "/pspfontcache"
# This allows us to change languages without editing the ebuild.
#
@@ -394,7 +394,7 @@ src_install() {
[ -z "${LANGUAGE}" ] && LANGUAGE=01
get_EnvSet
-
+
# The install part should now be relatively OK compared to
# what it was. Basically we use autoresponse files to install
# unattended, running under a Xvfb if needed. Afterwards we
@@ -417,7 +417,7 @@ src_install() {
[JAVA]
JavaSupport=preinstalled_or_none
END_RS
-
+
# Autoresponse file for user isntallation
cat > ${T}/rsfile-local <<-"END_RS"
[ENVIRONMENT]
@@ -467,7 +467,7 @@ src_install() {
insinto /etc/openoffice
sed -e "s|<pv>|${PV//_beta2}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf
doins ${T}/autoresponse-${PV}.conf
-
+
# Install wrapper script
exeinto /usr/bin
sed -e "s|<pv>|${PV}|g" \
@@ -490,7 +490,7 @@ src_install() {
# Install the files needed for the catagory
doins ${D}${INSTDIR}/share/gnome/net/.directory
doins ${D}${INSTDIR}/share/gnome/net/.order
-
+
for x in ${D}${INSTDIR}/share/gnome/net/*.desktop
do
# We have to handle setup differently
@@ -504,7 +504,7 @@ src_install() {
if [ -n "`use kde`" ]
then
local kdeloc="${D}${INSTDIR}/share/kde/net/"
-
+
insinto /usr/share/applnk/OpenOffice.org\ 1.1
# Install the files needed for the catagory
doins ${kdeloc}/.directory
@@ -512,7 +512,7 @@ src_install() {
dodir /usr/share
# Install the icons and mime info
cp -a ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
-
+
for x in ${kdeloc}/*.desktop
do
# We have to handle setup differently
@@ -551,7 +551,7 @@ pkg_postinst() {
einfo
einfo " If the fonts appear garbled in the user interface refer to "
einfo " Bug 8539, or http://www.openoffice.org/FAQs/fontguide.html#8"
- einfo
+ einfo
einfo "******************************************************************"
-}
+}
diff --git a/app-office/openoffice/openoffice-1.1_rc1.ebuild b/app-office/openoffice/openoffice-1.1_rc1.ebuild
index 5466a426288f..596e952d9981 100644
--- a/app-office/openoffice/openoffice-1.1_rc1.ebuild
+++ b/app-office/openoffice/openoffice-1.1_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_rc1.ebuild,v 1.4 2003/08/17 18:03:39 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_rc1.ebuild,v 1.5 2003/09/06 22:21:02 msterret Exp $
# IMPORTANT: This is extremely alpha!!!
@@ -135,7 +135,7 @@ pkg_setup() {
eerror "you could do the following:"
eerror
eerror " # export FORCE_JAVA=yes"
- eerror
+ eerror
die
fi
@@ -164,7 +164,7 @@ oo_setup() {
export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
# Just recheck gcc version ...
- if [ "$(gcc-version)" != "3.2" ]
+ if [ "$(gcc-version)" != "3.2" ]
then
# See if we can get a gcc profile we know is proper ...
if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1 &> /dev/null
@@ -258,8 +258,8 @@ src_compile() {
export CC="/usr/bin/ccache/ccache ${CC}"
export CXX="/usr/bin/ccache/ccache ${CXX}"
fi
-
- # Enable new ccache for this build
+
+ # Enable new ccache for this build
if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \
"${FEATURES/ccache/}" != "${FEATURES}" -a \
-x /usr/bin/ccache ]
@@ -269,7 +269,7 @@ src_compile() {
export CC="/usr/bin/ccache ${CC}"
export CXX="/usr/bin/ccache ${CXX}"
fi
-
+
# Enable distcc for this build (Az)
if [ "${FEATURES/-distcc/}" = "${FEATURES}" -a \
"${FEATURES/distcc/}" != "${FEATURES}" -a \
@@ -294,10 +294,10 @@ src_compile() {
--with-jdk-home=${JAVA_HOME} \
--with-lang=ALL\
--with-x || die
-
+
cd ${S}
get_EnvSet
-
+
# Do not include /usr/include in header search path, and
# same thing for internal gcc include dir, as gcc3 handles
# it correctly by default! (Az)
@@ -323,13 +323,13 @@ src_compile() {
else
buildcmd="${S}/solenv/bin/build.pl -all product=full"
fi
-
+
if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
then
# Set CCCOMP and CXXCOMP. This is still needed for STLport
echo "setenv CCCOMP \"${CC}\"" >> ${S}/${LinuxEnvSet}
echo "setenv CXXCOMP \"${CXX}\"" >> ${S}/${LinuxEnvSet}
- fi
+ fi
if [ "$(gcc-major-version)" -eq 3 ]
then
@@ -379,7 +379,7 @@ src_install() {
addpredict "/share"
addpredict "/dev/dri"
addpredict "/usr/bin/soffice"
- addpredict "/pspfontcache"
+ addpredict "/pspfontcache"
# This allows us to change languages without editing the ebuild.
#
@@ -393,7 +393,7 @@ src_install() {
[ -z "${LANGUAGE}" ] && LANGUAGE=01
get_EnvSet
-
+
# The install part should now be relatively OK compared to
# what it was. Basically we use autoresponse files to install
# unattended, running under a Xvfb if needed. Afterwards we
@@ -416,7 +416,7 @@ src_install() {
[JAVA]
JavaSupport=preinstalled_or_none
END_RS
-
+
# Autoresponse file for user isntallation
cat > ${T}/rsfile-local <<-"END_RS"
[ENVIRONMENT]
@@ -466,7 +466,7 @@ src_install() {
insinto /etc/openoffice
sed -e "s|<pv>|${PV//_beta2}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf
doins ${T}/autoresponse-${PV}.conf
-
+
# Install wrapper script
exeinto /usr/bin
sed -e "s|<pv>|${PV}|g" \
@@ -489,7 +489,7 @@ src_install() {
# Install the files needed for the catagory
doins ${D}${INSTDIR}/share/gnome/net/.directory
doins ${D}${INSTDIR}/share/gnome/net/.order
-
+
for x in ${D}${INSTDIR}/share/gnome/net/*.desktop
do
# We have to handle setup differently
@@ -503,7 +503,7 @@ src_install() {
if [ -n "`use kde`" ]
then
local kdeloc="${D}${INSTDIR}/share/kde/net/"
-
+
insinto /usr/share/applnk/OpenOffice.org\ 1.1
# Install the files needed for the catagory
doins ${kdeloc}/.directory
@@ -511,7 +511,7 @@ src_install() {
dodir /usr/share
# Install the icons and mime info
cp -a ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
-
+
for x in ${kdeloc}/*.desktop
do
# We have to handle setup differently
@@ -550,7 +550,7 @@ pkg_postinst() {
einfo
einfo " If the fonts appear garbled in the user interface refer to "
einfo " Bug 8539, or http://www.openoffice.org/FAQs/fontguide.html#8"
- einfo
+ einfo
einfo "******************************************************************"
-}
+}
diff --git a/app-office/openoffice/openoffice-1.1_rc2.ebuild b/app-office/openoffice/openoffice-1.1_rc2.ebuild
index 2969e0fcd6a5..cee5d5aceef9 100644
--- a/app-office/openoffice/openoffice-1.1_rc2.ebuild
+++ b/app-office/openoffice/openoffice-1.1_rc2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_rc2.ebuild,v 1.2 2003/08/17 11:56:35 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_rc2.ebuild,v 1.3 2003/09/06 22:21:02 msterret Exp $
# IMPORTANT: This is extremely alpha!!!
@@ -134,7 +134,7 @@ pkg_setup() {
eerror "you could do the following:"
eerror
eerror " # export FORCE_JAVA=yes"
- eerror
+ eerror
die
fi
@@ -225,7 +225,7 @@ oo_setup() {
export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
# Just recheck gcc version ...
- if [ "$(gcc-version)" != "3.2" ]
+ if [ "$(gcc-version)" != "3.2" ]
then
# See if we can get a gcc profile we know is proper ...
if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1 &> /dev/null
@@ -323,8 +323,8 @@ src_compile() {
export CC="/usr/bin/ccache/ccache ${CC}"
export CXX="/usr/bin/ccache/ccache ${CXX}"
fi
-
- # Enable new ccache for this build
+
+ # Enable new ccache for this build
if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \
"${FEATURES/ccache/}" != "${FEATURES}" -a \
-x /usr/bin/ccache ]
@@ -334,7 +334,7 @@ src_compile() {
export CC="/usr/bin/ccache ${CC}"
export CXX="/usr/bin/ccache ${CXX}"
fi
-
+
# Enable distcc for this build (Az)
if [ "${FEATURES/-distcc/}" = "${FEATURES}" -a \
"${FEATURES/distcc/}" != "${FEATURES}" -a \
@@ -359,10 +359,10 @@ src_compile() {
--with-jdk-home=${JAVA_HOME} \
--with-lang=${LANGNAME}\
--with-x || die
-
+
cd ${S}
get_EnvSet
-
+
# Do not include /usr/include in header search path, and
# same thing for internal gcc include dir, as gcc3 handles
# it correctly by default! (Az)
@@ -399,7 +399,7 @@ src_compile() {
# Set CCCOMP and CXXCOMP. This is still needed for STLport
echo "setenv CCCOMP \"${CC}\"" >> ${S}/${LinuxEnvSet}
echo "setenv CXXCOMP \"${CXX}\"" >> ${S}/${LinuxEnvSet}
- fi
+ fi
if [ "$(gcc-major-version)" -eq 3 ]
then
@@ -449,7 +449,7 @@ src_install() {
addpredict "/share"
addpredict "/dev/dri"
addpredict "/usr/bin/soffice"
- addpredict "/pspfontcache"
+ addpredict "/pspfontcache"
# This allows us to change languages without editing the ebuild.
#
@@ -463,7 +463,7 @@ src_install() {
set_languages
get_EnvSet
-
+
# The install part should now be relatively OK compared to
# what it was. Basically we use autoresponse files to install
# unattended, running under a Xvfb if needed. Afterwards we
@@ -486,7 +486,7 @@ src_install() {
[JAVA]
JavaSupport=preinstalled_or_none
END_RS
-
+
# Autoresponse file for user isntallation
cat > ${T}/rsfile-local <<-"END_RS"
[ENVIRONMENT]
@@ -536,7 +536,7 @@ src_install() {
insinto /etc/openoffice
sed -e "s|<pv>|${PV//_beta2}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf
doins ${T}/autoresponse-${PV}.conf
-
+
# Install wrapper script
exeinto /usr/bin
sed -e "s|<pv>|${PV}|g" \
@@ -559,7 +559,7 @@ src_install() {
# Install the files needed for the catagory
doins ${D}${INSTDIR}/share/gnome/net/.directory
doins ${D}${INSTDIR}/share/gnome/net/.order
-
+
for x in ${D}${INSTDIR}/share/gnome/net/*.desktop
do
# We have to handle setup differently
@@ -573,14 +573,14 @@ src_install() {
if [ -n "`use kde`" ]
then
local kdeloc="${D}${INSTDIR}/share/kde/net/"
-
+
insinto /usr/share/applnk/OpenOffice.org\ 1.1
# Install the files needed for the catagory
doins ${kdeloc}/.directory
dodir /usr/share
# Install the icons and mime info
cp -a ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
-
+
for x in ${kdeloc}/*.desktop
do
# We have to handle setup differently
@@ -619,7 +619,7 @@ pkg_postinst() {
einfo
einfo " If the fonts appear garbled in the user interface refer to "
einfo " Bug 8539, or http://www.openoffice.org/FAQs/fontguide.html#8"
- einfo
+ einfo
einfo "******************************************************************"
-}
+}
diff --git a/app-office/openoffice/openoffice-1.1_rc3.ebuild b/app-office/openoffice/openoffice-1.1_rc3.ebuild
index 48a05f79334d..133ce679869a 100644
--- a/app-office/openoffice/openoffice-1.1_rc3.ebuild
+++ b/app-office/openoffice/openoffice-1.1_rc3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_rc3.ebuild,v 1.1 2003/08/20 07:57:01 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_rc3.ebuild,v 1.2 2003/09/06 22:21:02 msterret Exp $
# IMPORTANT: This is extremely alpha!!!
@@ -134,7 +134,7 @@ pkg_setup() {
eerror "you could do the following:"
eerror
eerror " # export FORCE_JAVA=yes"
- eerror
+ eerror
die
fi
@@ -225,7 +225,7 @@ oo_setup() {
export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
# Just recheck gcc version ...
- if [ "$(gcc-version)" != "3.2" ]
+ if [ "$(gcc-version)" != "3.2" ]
then
# See if we can get a gcc profile we know is proper ...
if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1 &> /dev/null
@@ -333,8 +333,8 @@ src_compile() {
export CC="/usr/bin/ccache/ccache ${CC}"
export CXX="/usr/bin/ccache/ccache ${CXX}"
fi
-
- # Enable new ccache for this build
+
+ # Enable new ccache for this build
if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \
"${FEATURES/ccache/}" != "${FEATURES}" -a \
-x /usr/bin/ccache ]
@@ -344,7 +344,7 @@ src_compile() {
export CC="/usr/bin/ccache ${CC}"
export CXX="/usr/bin/ccache ${CXX}"
fi
-
+
# Enable distcc for this build (Az)
if [ "${FEATURES/-distcc/}" = "${FEATURES}" -a \
"${FEATURES/distcc/}" != "${FEATURES}" -a \
@@ -369,10 +369,10 @@ src_compile() {
--with-jdk-home=${JAVA_HOME} \
--with-lang=${LANGNAME}\
--with-x || die
-
+
cd ${S}
get_EnvSet
-
+
# Do not include /usr/include in header search path, and
# same thing for internal gcc include dir, as gcc3 handles
# it correctly by default! (Az)
@@ -404,7 +404,7 @@ src_compile() {
# Set CCCOMP and CXXCOMP. This is still needed for STLport
echo "setenv CCCOMP \"${CC}\"" >> ${S}/${LinuxEnvSet}
echo "setenv CXXCOMP \"${CXX}\"" >> ${S}/${LinuxEnvSet}
- fi
+ fi
if [ "$(gcc-major-version)" -eq 3 ]
then
@@ -454,7 +454,7 @@ src_install() {
addpredict "/share"
addpredict "/dev/dri"
addpredict "/usr/bin/soffice"
- addpredict "/pspfontcache"
+ addpredict "/pspfontcache"
# This allows us to change languages without editing the ebuild.
#
@@ -468,7 +468,7 @@ src_install() {
set_languages
get_EnvSet
-
+
# The install part should now be relatively OK compared to
# what it was. Basically we use autoresponse files to install
# unattended, running under a Xvfb if needed. Afterwards we
@@ -491,7 +491,7 @@ src_install() {
[JAVA]
JavaSupport=preinstalled_or_none
END_RS
-
+
# Autoresponse file for user isntallation
cat > ${T}/rsfile-local <<-"END_RS"
[ENVIRONMENT]
@@ -541,7 +541,7 @@ src_install() {
insinto /etc/openoffice
sed -e "s|<pv>|${PV//_rc3/.0}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf
doins ${T}/autoresponse-${PV}.conf
-
+
# Install wrapper script
exeinto /usr/bin
sed -e "s|<pv>|${PV}|g" \
@@ -564,7 +564,7 @@ src_install() {
# Install the files needed for the catagory
doins ${D}${INSTDIR}/share/gnome/net/.directory
doins ${D}${INSTDIR}/share/gnome/net/.order
-
+
for x in ${D}${INSTDIR}/share/gnome/net/*.desktop
do
# We have to handle setup differently
@@ -578,14 +578,14 @@ src_install() {
if [ -n "`use kde`" ]
then
local kdeloc="${D}${INSTDIR}/share/kde/net/"
-
+
insinto /usr/share/applnk/OpenOffice.org\ 1.1
# Install the files needed for the catagory
doins ${kdeloc}/.directory
dodir /usr/share
# Install the icons and mime info
cp -a ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
-
+
for x in ${kdeloc}/*.desktop
do
# We have to handle setup differently
@@ -624,7 +624,7 @@ pkg_postinst() {
einfo
einfo " If the fonts appear garbled in the user interface refer to "
einfo " Bug 8539, or http://www.openoffice.org/FAQs/fontguide.html#8"
- einfo
+ einfo
einfo "******************************************************************"
-}
+}