From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1098632-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 1DC21138334
for <garchives@archives.gentoo.org>; Sun, 7 Jul 2019 16:46:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4C431E0827;
Sun, 7 Jul 2019 16:46:21 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 252D1E0827
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Jul 2019 16:46:21 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 16AF63472E0
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Jul 2019 16:46:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 825FB326
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Jul 2019 16:46:18 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1562517832.0c1ba633950f3813d6eee9677affc1d5a20b8720.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice-bin/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/libreoffice-bin/libreoffice-bin-6.2.5.2.ebuild
X-VCS-Directories: app-office/libreoffice-bin/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 0c1ba633950f3813d6eee9677affc1d5a20b8720
X-VCS-Branch: master
Date: Sun, 7 Jul 2019 16:46:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 255d3fe1-af17-4bcb-9e35-c704b5ec0369
X-Archives-Hash: fafa0cbcdb769046a6371d889caa0ddd
commit: 0c1ba633950f3813d6eee9677affc1d5a20b8720
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 7 16:43:52 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 7 16:43:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c1ba633
app-office/libreoffice-bin: EAPI-7, drop gnome2-utils, pax-utils
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libreoffice-bin/libreoffice-bin-6.2.5.2.ebuild | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.2.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.2.5.2.ebuild
index 964f77080a5..8317169b37e 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-6.2.5.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.2.5.2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
BASE_PACKAGENAME="bin"
BASE_AMD64_URI="https://tamiko.kyomu.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
@@ -10,7 +10,7 @@ BASE_X86_URI="https://tamiko.kyomu.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
PYTHON_COMPAT=( python3_6 )
PYTHON_REQ_USE="threads,xml"
-inherit gnome2-utils java-pkg-opt-2 python-single-r1 pax-utils prefix versionator xdg-utils
+inherit java-pkg-opt-2 python-single-r1 prefix xdg-utils
DESCRIPTION="A full office productivity suite. Binary package"
HOMEPAGE="https://www.libreoffice.org"
@@ -157,8 +157,8 @@ COMMON_DEPEND="
kde? (
dev-qt/qtcore:5
dev-qt/qtgui:5
- dev-qt/qtx11extras:5
dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
kde-frameworks/kconfig:5
kde-frameworks/kcoreaddons:5
kde-frameworks/ki18n:5
@@ -213,7 +213,7 @@ src_unpack() {
use gnome && patchname="-gnome"
use java && patchname="${patchname}-java"
- if [ -n "${patchname}" ]; then
+ if [[ -n "${patchname}" ]]; then
einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
@@ -241,24 +241,17 @@ src_install() {
insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
}
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
xdg_desktop_database_update
xdg_mimeinfo_database_update
- pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-
use java || \
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
xdg_desktop_database_update
xdg_mimeinfo_database_update
}