From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 93725138334 for ; Wed, 16 Jan 2019 09:29:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33C71E0A52; Wed, 16 Jan 2019 09:29:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 04E45E0A52 for ; Wed, 16 Jan 2019 09:29:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B7C36335C51 for ; Wed, 16 Jan 2019 09:29:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3F13266 for ; Wed, 16 Jan 2019 09:29:39 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1547630968.104b4024f0ab61ac89430a63eff0b33c32dd1643.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-6.2.0.2.ebuild app-office/libreoffice/libreoffice-6.2.9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 104b4024f0ab61ac89430a63eff0b33c32dd1643 X-VCS-Branch: master Date: Wed, 16 Jan 2019 09:29:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 50ec08fb-fe5d-4d42-89ae-57f74927172c X-Archives-Hash: 5e2c59cfadf64aea4d6479a1d9c77ae8 commit: 104b4024f0ab61ac89430a63eff0b33c32dd1643 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 16 09:26:23 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 16 09:29:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=104b4024 app-office/libreoffice: poppler patches upstreamed to 6.1/6.2 branch Package-Manager: Portage-2.3.55, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/libreoffice/libreoffice-6.2.0.2.ebuild | 2 +- app-office/libreoffice/libreoffice-6.2.9999.ebuild | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild index 9dc3659a431..e2865fbd55d 100644 --- a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild @@ -253,7 +253,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" - # master branch + # 6.2 branch "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch "${FILESDIR}"/${P}-poppler-0.73.patch diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild index d1351356c1e..dbeed62a746 100644 --- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild @@ -251,10 +251,6 @@ PATCHES=( "${FILESDIR}/${PN}-5.4-system-pyuno.patch" "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" - - # master branch - "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch - "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch ) S="${WORKDIR}/${PN}-${MY_PV}"