Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-office/libreoffice-bin/ChangeLog6
-rw-r--r--app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild104
-rw-r--r--app-office/openoffice-bin/ChangeLog6
-rw-r--r--app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild84
4 files changed, 107 insertions, 93 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index d1620e2cf17c..bc6cb853743a 100644
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice-bin
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.16 2011/03/17 13:49:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.17 2011/03/18 22:54:58 suka Exp $
+
+ 18 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+ libreoffice-bin-3.3.1.ebuild:
+ some ebuild reorganization to make future maintenance easier
17 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
libreoffice-bin-3.3.1.ebuild:
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild
index 7ebb423ebb24..3ce36fbccfec 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild,v 1.6 2011/03/17 13:49:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild,v 1.7 2011/03/18 22:54:58 suka Exp $
EAPI="3"
@@ -14,18 +14,22 @@ BVER="3.3.1-8"
BVER2="3.3-8"
UREVER="1.7.0-8"
BASIS="libobasis3.3"
-FILEPATH="http://download.documentfoundation.org/libreoffice/stable/${PV}/rpm/"
+BASIS2="basis3.3"
+NM1="libreoffice"
+NM2="${NM1}3"
+NM3="${NM2}.3"
+FILEPATH="http://download.documentfoundation.org/${NM1}/stable/${PV}/rpm/"
if [ "${ARCH}" = "amd64" ] ; then
- LOARCH="x86_64"
- LOARCH2="x86-64"
+ XARCH="x86_64"
+ XARCH2="x86-64"
else
- LOARCH="i586"
- LOARCH2="x86"
+ XARCH="i586"
+ XARCH2="x86"
fi
S="${WORKDIR}/en-US/RPMS"
-UP="LibO_${MY_PV2}_Linux_${LOARCH2}_install-rpm_en-US/RPMS"
+UP="LibO_${MY_PV2}_Linux_${XARCH2}_install-rpm_en-US/RPMS"
DESCRIPTION="LibreOffice productivity suite."
SRC_URI="amd64? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_install-rpm_en-US.tar.gz
@@ -68,52 +72,52 @@ PDEPEND="java? ( >=virtual/jre-1.5 )"
RESTRICT="strip"
-QA_EXECSTACK="usr/$(get_libdir)/libreoffice/basis3.3/program/*
- usr/$(get_libdir)/libreoffice/ure/lib/*"
-QA_TEXTRELS="usr/$(get_libdir)/libreoffice/ure/lib/*"
-QA_PRESTRIPPED="usr/$(get_libdir)/libreoffice/basis3.3/program/*
- usr/$(get_libdir)/libreoffice/basis3.3/program/python-core-2.6.1/lib/lib-dynload/*
- usr/$(get_libdir)/libreoffice/program/*
- usr/$(get_libdir)/libreoffice/ure/bin/*
- usr/$(get_libdir)/libreoffice/ure/lib/*"
+QA_EXECSTACK="usr/$(get_libdir)/${NM1}/${BASIS2}/program/*
+ usr/$(get_libdir)/${NM1}/ure/lib/*"
+QA_TEXTRELS="usr/$(get_libdir)/${NM1}/ure/lib/*"
+QA_PRESTRIPPED="usr/$(get_libdir)/${NM1}/${BASIS2}/program/*
+ usr/$(get_libdir)/${NM1}/${BASIS2}/program/python-core-2.6.1/lib/lib-dynload/*
+ usr/$(get_libdir)/${NM1}/program/*
+ usr/$(get_libdir)/${NM1}/ure/bin/*
+ usr/$(get_libdir)/${NM1}/ure/lib/*"
src_unpack() {
unpack ${A}
- cp "${FILESDIR}"/{50-libreoffice-bin,wrapper.in} "${T}"
- eprefixify "${T}"/{50-libreoffice-bin,wrapper.in}
+ cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
+ eprefixify "${T}"/{50-${PN},wrapper.in}
for i in base binfilter calc core01 core02 core03 core04 core05 core06 \
core07 draw graphicfilter images impress math ogltrans ooofonts \
ooolinguistic pyuno testtool writer xsltfilter ; do
- rpm_unpack "./${UP}/${BASIS}-${i}-${BVER}.${LOARCH}.rpm"
+ rpm_unpack "./${UP}/${BASIS}-${i}-${BVER}.${XARCH}.rpm"
done
- rpm_unpack "./${UP}/libreoffice3-${BVER}.${LOARCH}.rpm"
- rpm_unpack "./${UP}/libreoffice3-ure-${UREVER}.${LOARCH}.rpm"
+ rpm_unpack "./${UP}/${NM2}-${BVER}.${XARCH}.rpm"
+ rpm_unpack "./${UP}/${NM2}-ure-${UREVER}.${XARCH}.rpm"
for j in base calc draw impress math writer; do
- rpm_unpack "./${UP}/libreoffice3-${j}-${BVER}.${LOARCH}.rpm"
+ rpm_unpack "./${UP}/${NM2}-${j}-${BVER}.${XARCH}.rpm"
done
- rpm_unpack "./${UP}/desktop-integration/libreoffice3.3-freedesktop-menus-${BVER2}.noarch.rpm"
+ rpm_unpack "./${UP}/desktop-integration/${NM3}-freedesktop-menus-${BVER2}.noarch.rpm"
- use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${BVER}.${LOARCH}.rpm"
- use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${BVER}.${LOARCH}.rpm"
+ use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${BVER}.${XARCH}.rpm"
+ use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${BVER}.${XARCH}.rpm"
# Extensions
for k in mediawiki-publisher nlpsolver pdf-import presentation-minimizer presenter-screen report-builder; do
- rpm_unpack "./${UP}/${BASIS}-extension-${k}-${BVER}.${LOARCH}.rpm"
+ rpm_unpack "./${UP}/${BASIS}-extension-${k}-${BVER}.${XARCH}.rpm"
done
# English support installed by default
- rpm_unpack "./${UP}/${BASIS}-en-US-${BVER}.${LOARCH}.rpm"
- rpm_unpack "./${UP}/libreoffice3-en-US-${BVER}.${LOARCH}.rpm"
- rpm_unpack "./${UP}/libreoffice3-dict-en-${BVER}.${LOARCH}.rpm"
- use offlinehelp && rpm_unpack "./LibO_${MY_PV2}_Linux_${LOARCH2}_helppack-rpm_en-US/RPMS//${BASIS}-en-US-help-${BVER}.${LOARCH}.rpm"
+ rpm_unpack "./${UP}/${BASIS}-en-US-${BVER}.${XARCH}.rpm"
+ rpm_unpack "./${UP}/${NM2}-en-US-${BVER}.${XARCH}.rpm"
+ rpm_unpack "./${UP}/${NM2}-dict-en-${BVER}.${XARCH}.rpm"
+ use offlinehelp && rpm_unpack "./LibO_${MY_PV2}_Linux_${XARCH2}_helppack-rpm_en-US/RPMS//${BASIS}-en-US-help-${BVER}.${XARCH}.rpm"
for s in base binfilter calc math res writer ; do
- rpm_unpack "./${UP}/${BASIS}-en-US-${s}-${BVER}.${LOARCH}.rpm"
+ rpm_unpack "./${UP}/${BASIS}-en-US-${s}-${BVER}.${XARCH}.rpm"
done
# Localization
@@ -121,25 +125,25 @@ src_unpack() {
for l in ${LINGUAS}; do
m="${l/_/-}"
if [[ ${m} != "en" ]] ; then
- LANGDIR="LibO_${MY_PV2}_Linux_${LOARCH2}_langpack-rpm_${m}/RPMS/"
- rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${BVER}.${LOARCH}.rpm"
- rpm_unpack "./${LANGDIR}/libreoffice3-${m}-${BVER}.${LOARCH}.rpm"
+ LANGDIR="LibO_${MY_PV2}_Linux_${XARCH2}_langpack-rpm_${m}/RPMS/"
+ rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${BVER}.${XARCH}.rpm"
+ rpm_unpack "./${LANGDIR}/${NM2}-${m}-${BVER}.${XARCH}.rpm"
for n in base binfilter calc math res writer; do
- rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${n}-${BVER}.${LOARCH}.rpm"
+ rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${n}-${BVER}.${XARCH}.rpm"
done
- for DICT_FILE in `find "./${LANGDIR}" -name "libreoffice3-dict-*-${BVER}.${LOARCH}.rpm"`; do
- DICT_REGEX="s/libreoffice3-dict-(.*?)-${BVER}.${LOARCH}.rpm/\1/"
+ for DICT_FILE in `find "./${LANGDIR}" -name "${NM2}-dict-*-${BVER}.${XARCH}.rpm"`; do
+ DICT_REGEX="s/${NM2}-dict-(.*?)-${BVER}.${XARCH}.rpm/\1/"
DICT_LOCALE=`basename "$DICT_FILE" | sed -E "${DICT_REGEX}"`
- if [[ -n "${DICT_LOCALE}" && ! -d "${WORKDIR}/opt/libreoffice/share/extensions/dict-${DICT_LOCALE}" ]] ; then
+ if [[ -n "${DICT_LOCALE}" && ! -d "${WORKDIR}/opt/${NM1}/share/extensions/dict-${DICT_LOCALE}" ]] ; then
rpm_unpack "${DICT_FILE}"
fi
done
# Help files
if use offlinehelp; then
- LANGDIR2="LibO_${MY_PV2}_Linux_${LOARCH2}_helppack-rpm_${m}/RPMS/"
- rpm_unpack "./${LANGDIR2}/${BASIS}-${m}-help-${BVER}.${LOARCH}.rpm"
+ LANGDIR2="LibO_${MY_PV2}_Linux_${XARCH2}_helppack-rpm_${m}/RPMS/"
+ rpm_unpack "./${LANGDIR2}/${BASIS}-${m}-help-${BVER}.${XARCH}.rpm"
fi
fi
done
@@ -148,11 +152,9 @@ src_unpack() {
src_install () {
- INSTDIR="/usr/$(get_libdir)/libreoffice"
-
- einfo "Installing OpenOffice.org into build root..."
+ INSTDIR="/usr/$(get_libdir)/${NM1}"
dodir ${INSTDIR}
- mv "${WORKDIR}"/opt/libreoffice/* "${ED}${INSTDIR}" || die
+ mv "${WORKDIR}"/opt/${NM1}/* "${ED}${INSTDIR}" || die
#Menu entries, icons and mime-types
cd "${ED}${INSTDIR}/share/xdg/"
@@ -160,33 +162,33 @@ src_install () {
if [ "${desk}" = "javafilter" ] ; then
use java || { rm javafilter.desktop; continue; }
fi
- mv ${desk}.desktop libreoffice-${desk}.desktop
- domenu libreoffice-${desk}.desktop
+ mv ${desk}.desktop ${NM1}-${desk}.desktop
+ domenu ${NM1}-${desk}.desktop
done
insinto /usr/share
doins -r "${WORKDIR}"/usr/share/icons
doins -r "${WORKDIR}"/usr/share/mime
# Install wrapper script
- newbin "${T}/wrapper.in" libreoffice
- sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/libreoffice" || die
+ newbin "${T}/wrapper.in" ${NM1}
+ sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/${NM1}" || die
# Component symlinks
for app in base calc draw impress math writer; do
dosym ${INSTDIR}/program/s${app} /usr/bin/lo${app}
done
- dosym ${INSTDIR}/program/spadmin /usr/bin/libreoffice-printeradmin
+ dosym ${INSTDIR}/program/spadmin /usr/bin/${NM1}-printeradmin
dosym ${INSTDIR}/program/soffice /usr/bin/soffice
rm -f "${ED}${INSTDIR}/basis-link" || die
- dosym ${INSTDIR}/basis3.3 ${INSTDIR}/basis-link
+ dosym ${INSTDIR}/${BASIS2} ${INSTDIR}/basis-link
# Non-java weirdness see bug #99366
use !java && rm -f "${ED}${INSTDIR}/ure/bin/javaldx"
# prevent revdep-rebuild from attempting to rebuild all the time
- insinto /etc/revdep-rebuild && doins "${T}/50-libreoffice-bin"
+ insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
}
@@ -202,7 +204,7 @@ pkg_postinst() {
fdo-mime_mime_database_update
use gnome && gnome2_icon_cache_update
- pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM1}/program/soffice.bin
}
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index 83f67a41e9ed..c992ae31213a 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/openoffice-bin
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.242 2011/03/17 13:51:00 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.243 2011/03/18 22:58:10 suka Exp $
+
+ 18 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-bin-3.3.0.ebuild:
+ some ebuild reorganization to make future maintenance easier
17 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
openoffice-bin-3.3.0.ebuild:
diff --git a/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild b/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild
index 0bb7e82e83fb..3019f719a594 100644
--- a/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.6 2011/03/17 13:51:00 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.7 2011/03/18 22:58:10 suka Exp $
EAPI="3"
@@ -10,20 +10,26 @@ IUSE="gnome java"
BUILDID="9567"
BUILDID2="9556"
-UREVER="1.7.0"
+MST="OOO330_m20"
MY_PV="${PV}rc10"
MY_PV2="${MY_PV}_20110118"
-MY_PV3="${PV}-${BUILDID}"
+BVER="${PV}-${BUILDID}"
+BVER2="3.3-${BUILDID2}"
+UREVER="1.7.0"
BASIS="ooobasis3.3"
-MST="OOO330_m20"
+BASIS2="basis3.3"
+NM="openoffice"
+NM1="${NM}.org"
+NM2="${NM1}3"
+NM3="${NM2}.3"
FILEPATH="http://download.services.openoffice.org/files/extended/${MY_PV}"
if [ "${ARCH}" = "amd64" ] ; then
- OOARCH="x86_64"
+ XARCH="x86_64"
PACKED="${MST}_native_packed-1"
PACKED2="${MST}_native_packed-1"
else
- OOARCH="i586"
+ XARCH="i586"
PACKED="${MST}_native_packed-1"
PACKED2="${MST}_native_packed-1"
fi
@@ -68,40 +74,40 @@ PDEPEND="java? ( >=virtual/jre-1.5 )"
RESTRICT="strip"
-QA_EXECSTACK="usr/$(get_libdir)/openoffice/basis3.3/program/*
- usr/$(get_libdir)/openoffice/ure/lib/*"
-QA_TEXTRELS="usr/$(get_libdir)/openoffice/basis3.3/program/libvclplug_genli.so \
- usr/$(get_libdir)/openoffice/basis3.3/program/python-core-2.6.1/lib/lib-dynload/_curses_panel.so \
- usr/$(get_libdir)/openoffice/basis3.3/program/python-core-2.6.1/lib/lib-dynload/_curses.so \
- usr/$(get_libdir)/openoffice/ure/lib/*"
+QA_EXECSTACK="usr/$(get_libdir)/${NM}/${BASIS2}/program/*
+ usr/$(get_libdir)/${NM}/ure/lib/*"
+QA_TEXTRELS="usr/$(get_libdir)/${NM}/${BASIS2}/program/libvclplug_genli.so \
+ usr/$(get_libdir)/${NM}/${BASIS2}/program/python-core-2.6.1/lib/lib-dynload/_curses_panel.so \
+ usr/$(get_libdir)/${NM}/${BASIS2}/program/python-core-2.6.1/lib/lib-dynload/_curses.so \
+ usr/$(get_libdir)/${NM}/ure/lib/*"
src_unpack() {
unpack ${A}
- cp "${FILESDIR}"/{50-openoffice-bin,wrapper.in} "${T}"
- eprefixify "${T}"/{50-openoffice-bin,wrapper.in}
+ cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
+ eprefixify "${T}"/{50-${PN},wrapper.in}
for i in base binfilter calc core01 core02 core03 core04 core05 core06 core07 draw graphicfilter images impress math ooofonts oooimprovement ooolinguistic pyuno testtool writer xsltfilter ; do
- rpm_unpack "./${UP}/${BASIS}-${i}-${MY_PV3}.${OOARCH}.rpm"
+ rpm_unpack "./${UP}/${BASIS}-${i}-${BVER}.${XARCH}.rpm"
done
+ rpm_unpack "./${UP}/${NM2}-${BVER}.${XARCH}.rpm"
+ rpm_unpack "./${UP}/${NM1}-ure-${UREVER}-${BUILDID}.${XARCH}.rpm"
+
for j in base calc draw impress math writer; do
- rpm_unpack "./${UP}/openoffice.org3-${j}-${MY_PV3}.${OOARCH}.rpm"
+ rpm_unpack "./${UP}/${NM2}-${j}-${BVER}.${XARCH}.rpm"
done
- rpm_unpack "./${UP}/openoffice.org3-${MY_PV3}.${OOARCH}.rpm"
- rpm_unpack "./${UP}/openoffice.org-ure-${UREVER}-${BUILDID}.${OOARCH}.rpm"
-
- rpm_unpack "./${UP}/desktop-integration/openoffice.org3.3-freedesktop-menus-3.3-${BUILDID2}.noarch.rpm"
+ rpm_unpack "./${UP}/desktop-integration/${NM3}-freedesktop-menus-${BVER2}.noarch.rpm"
- use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${MY_PV3}.${OOARCH}.rpm"
- use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${MY_PV3}.${OOARCH}.rpm"
+ use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${BVER}.${XARCH}.rpm"
+ use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${BVER}.${XARCH}.rpm"
# Unpack provided dictionaries, unless there is a better solution...
- rpm_unpack "./${UP}/openoffice.org3-dict-en-${MY_PV3}.${OOARCH}.rpm"
- rpm_unpack "./${UP}/openoffice.org3-dict-es-${MY_PV3}.${OOARCH}.rpm"
- rpm_unpack "./${UP}/openoffice.org3-dict-fr-${MY_PV3}.${OOARCH}.rpm"
+ rpm_unpack "./${UP}/${NM2}-dict-en-${BVER}.${XARCH}.rpm"
+ rpm_unpack "./${UP}/${NM2}-dict-es-${BVER}.${XARCH}.rpm"
+ rpm_unpack "./${UP}/${NM2}-dict-fr-${BVER}.${XARCH}.rpm"
# Localization
strip-linguas ${LANGS}
@@ -117,10 +123,10 @@ src_unpack() {
else
LANGDIR="${PACKED2}_${i}.${BUILDID}/RPMS/"
fi
- rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${MY_PV3}.${OOARCH}.rpm"
- rpm_unpack "./${LANGDIR}/openoffice.org3-${i}-${MY_PV3}.${OOARCH}.rpm"
+ rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${BVER}.${XARCH}.rpm"
+ rpm_unpack "./${LANGDIR}/${NM2}-${i}-${BVER}.${XARCH}.rpm"
for j in base binfilter calc draw help impress math res writer; do
- rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${j}-${MY_PV3}.${OOARCH}.rpm"
+ rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${j}-${BVER}.${XARCH}.rpm"
done
done
@@ -128,12 +134,10 @@ src_unpack() {
src_install () {
- INSTDIR="/usr/$(get_libdir)/openoffice"
-
- einfo "Installing OpenOffice.org into build root..."
+ INSTDIR="/usr/$(get_libdir)/${NM}"
dodir ${INSTDIR}
- mv "${WORKDIR}"/opt/openoffice.org/* "${ED}${INSTDIR}" || die
- mv "${WORKDIR}"/opt/openoffice.org3/* "${ED}${INSTDIR}" || die
+ mv "${WORKDIR}"/opt/${NM1}/* "${ED}${INSTDIR}" || die
+ mv "${WORKDIR}"/opt/${NM2}/* "${ED}${INSTDIR}" || die
#Menu entries, icons and mime-types
cd "${ED}${INSTDIR}/share/xdg/"
@@ -141,9 +145,9 @@ src_install () {
if [ "${desk}" = "javafilter" ] ; then
use java || { rm javafilter.desktop; continue; }
fi
- mv ${desk}.desktop openoffice.org-${desk}.desktop
- sed -i -e s/openoffice.org3/ooffice/g openoffice.org-${desk}.desktop || die
- domenu openoffice.org-${desk}.desktop
+ mv ${desk}.desktop ${NM1}-${desk}.desktop
+ sed -i -e s/${NM2}/ooffice/g ${NM1}-${desk}.desktop || die
+ domenu ${NM1}-${desk}.desktop
done
insinto /usr/share
doins -r "${WORKDIR}"/usr/share/icons
@@ -165,16 +169,16 @@ src_install () {
dosym ${INSTDIR}/program/soffice /usr/bin/soffice
rm -f "${ED}${INSTDIR}/basis-link" || die
- dosym ${INSTDIR}/basis3.3 ${INSTDIR}/basis-link
+ dosym ${INSTDIR}/${BASIS2} ${INSTDIR}/basis-link
# Change user install dir
- sed -i -e "s/.openoffice.org\/3/.ooo3/g" "${ED}${INSTDIR}/program/bootstraprc" || die
+ sed -i -e "s/.${NM1}\/3/.ooo3/g" "${ED}${INSTDIR}/program/bootstraprc" || die
# Non-java weirdness see bug #99366
use !java && rm -f "${ED}${INSTDIR}/ure/bin/javaldx"
# prevent revdep-rebuild from attempting to rebuild all the time
- insinto /etc/revdep-rebuild && doins "${T}/50-openoffice-bin"
+ insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
}
@@ -190,7 +194,7 @@ pkg_postinst() {
fdo-mime_mime_database_update
use gnome && gnome2_icon_cache_update
- pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/openoffice/program/soffice.bin
+ pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin
elog " openoffice-bin does not provide integration with system spell "
elog " dictionaries. Please install them manually through the Extensions "