commit: 214250fa96205740d959178cedc4674e16a354c6
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun May 15 21:37:30 2022 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Sun May 15 21:37:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=214250fa
app-office/openoffice-bin: some ebuild fixes
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
app-office/openoffice-bin/openoffice-bin-4.1.11.ebuild | 15 +++++++--------
app-office/openoffice-bin/openoffice-bin-4.1.12.ebuild | 10 +++++-----
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.11.ebuild
b/app-office/openoffice-bin/openoffice-bin-4.1.11.ebuild
index b55471725..0a5cc953e 100644
--- a/app-office/openoffice-bin/openoffice-bin-4.1.11.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
inherit desktop pax-utils prefix rpm xdg
@@ -46,7 +46,6 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
- !app-office/openoffice
!prefix? ( sys-libs/glibc )
app-arch/unzip
app-arch/zip
@@ -74,7 +73,7 @@ PDEPEND="java? ( || ( >=virtual/jre-1.8.0
dev-java/openjdk-jre-bin:11 dev-java/o
RESTRICT="mirror strip"
-S=${WORKDIR}
+S="${WORKDIR}"
pkg_setup() {
QA_PREBUILT="usr/$(get_libdir)/${NM}/program/*"
@@ -84,7 +83,7 @@ pkg_setup() {
src_unpack() {
unpack ${A}
- cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
+ cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}" || die
eprefixify "${T}"/{50-${PN},wrapper.in}
# 'pyuno' is excluded from unpack list to switch off Python2 scripts
support
@@ -135,12 +134,12 @@ src_install() {
mv "${WORKDIR}"/opt/${NM2}/* "${ED}${INSTDIR}" || die
#Menu entries, icons and mime-types
- cd "${ED}${INSTDIR}/share/xdg/"
+ cd "${ED}${INSTDIR}/share/xdg/" || die
for desk in base calc draw impress javafilter math printeradmin qstart
startcenter writer; do
if [ "${desk}" = "javafilter" ] ; then
use java || { rm javafilter.desktop; continue; }
fi
- mv ${desk}.desktop ${NM}-${desk}.desktop
+ mv ${desk}.desktop ${NM}-${desk}.desktop || die
sed -i -e "s/${NM2} /ooffice /g" ${NM}-${desk}.desktop || die
domenu ${NM}-${desk}.desktop
done
@@ -157,7 +156,7 @@ src_install() {
# Component symlinks
for app in base calc draw impress math writer; do
- cp "${ED}/usr/bin/ooffice" "${ED}/usr/bin/oo${app}"
+ cp "${ED}/usr/bin/ooffice" "${ED}/usr/bin/oo${app}" || die
sed -i -e s/soffice/s${app}/ "${ED}/usr/bin/oo${app}" || die
done
diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.12.ebuild
b/app-office/openoffice-bin/openoffice-bin-4.1.12.ebuild
index 02ffd9917..7ebfd61cf 100644
--- a/app-office/openoffice-bin/openoffice-bin-4.1.12.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.12.ebuild
@@ -73,7 +73,7 @@ PDEPEND="java? ( || ( >=virtual/jre-1.8.0
dev-java/openjdk-jre-bin:11 dev-java/o
RESTRICT="mirror strip"
-S=${WORKDIR}
+S="${WORKDIR}"
pkg_setup() {
QA_PREBUILT="usr/$(get_libdir)/${NM}/program/*"
@@ -83,7 +83,7 @@ pkg_setup() {
src_unpack() {
unpack ${A}
- cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
+ cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}" || die
eprefixify "${T}"/{50-${PN},wrapper.in}
# 'pyuno' is excluded from unpack list to switch off Python2 scripts
support
@@ -134,12 +134,12 @@ src_install() {
mv "${WORKDIR}"/opt/${NM2}/* "${ED}${INSTDIR}" || die
#Menu entries, icons and mime-types
- cd "${ED}${INSTDIR}/share/xdg/"
+ cd "${ED}${INSTDIR}/share/xdg/" || die
for desk in base calc draw impress javafilter math printeradmin qstart
startcenter writer; do
if [ "${desk}" = "javafilter" ] ; then
use java || { rm javafilter.desktop; continue; }
fi
- mv ${desk}.desktop ${NM}-${desk}.desktop
+ mv ${desk}.desktop ${NM}-${desk}.desktop || die
sed -i -e "s/${NM2} /ooffice /g" ${NM}-${desk}.desktop || die
domenu ${NM}-${desk}.desktop
done
@@ -156,7 +156,7 @@ src_install() {
# Component symlinks
for app in base calc draw impress math writer; do
- cp "${ED}/usr/bin/ooffice" "${ED}/usr/bin/oo${app}"
+ cp "${ED}/usr/bin/ooffice" "${ED}/usr/bin/oo${app}" || die
sed -i -e s/soffice/s${app}/ "${ED}/usr/bin/oo${app}" || die
done
