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 8639E1382C5 for ; Wed, 20 Jan 2021 21:37:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6CA8E0837; Wed, 20 Jan 2021 21:37:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 8A655E0837 for ; Wed, 20 Jan 2021 21:37: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 99253340EC9 for ; Wed, 20 Jan 2021 21:37:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E60447F for ; Wed, 20 Jan 2021 21:37:41 +0000 (UTC) From: "Andreas K. Hüttel" 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 K. Hüttel" Message-ID: <1611178650.0d82b105540296a86f20ad188eaa2018f0ec53fc.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xournalpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/xournalpp/Manifest app-text/xournalpp/xournalpp-1.0.20.ebuild app-text/xournalpp/xournalpp-9999.ebuild X-VCS-Directories: app-text/xournalpp/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 0d82b105540296a86f20ad188eaa2018f0ec53fc X-VCS-Branch: master Date: Wed, 20 Jan 2021 21:37:41 +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: 7aaf47c1-56a9-40e5-bce2-9b0d44a77be7 X-Archives-Hash: 25e7819ecd0cd2fc9f21e566bb3a0851 commit: 0d82b105540296a86f20ad188eaa2018f0ec53fc Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Jan 20 21:37:07 2021 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Wed Jan 20 21:37:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d82b105 app-text/xournalpp: Version bump Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas K. Hüttel gentoo.org> app-text/xournalpp/Manifest | 1 + .../{xournalpp-9999.ebuild => xournalpp-1.0.20.ebuild} | 10 +++++++--- app-text/xournalpp/xournalpp-9999.ebuild | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest index 7c0401e0f4e..e1652032186 100644 --- a/app-text/xournalpp/Manifest +++ b/app-text/xournalpp/Manifest @@ -1 +1,2 @@ DIST xournalpp-1.0.18.tgz 14892343 BLAKE2B d2aaede0e85d724cf8032f38a6fa2c3c4862f26d410dbab8264dd50ab8ee0d26889eeab433ef615fe9ce271710192eca380ff80149431d5368125926cf8d2b25 SHA512 90568a2674a18ff711ecef5f1a66ea1c5746d7f1fde271b36342d9bf48e096e63075cf7fd8b69e39e144273a4d1b922c415eee929eba94b2fa515a0bb481815a +DIST xournalpp-1.0.20.tgz 14895705 BLAKE2B f1a4721f4f0b2f0e666c7466d7ddbd1f299172576d5f86b4ab8150d3bf05231cc7bb40e750394d892fe8ce32b6106e29456e3e9fa976b1bf07a808bf1bfff953 SHA512 c73783d5e40262b2c6f7f6be372839c73a19ab25fc258a7524660654526a3a35a6ba16ba282f793e7982ff97d006703c103fdd579fc16a3e636bf6daf94fe346 diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-1.0.20.ebuild similarity index 84% copy from app-text/xournalpp/xournalpp-9999.ebuild copy to app-text/xournalpp/xournalpp-1.0.20.ebuild index 7057d336d41..8d5be9b04fe 100644 --- a/app-text/xournalpp/xournalpp-9999.ebuild +++ b/app-text/xournalpp/xournalpp-1.0.20.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils xdg +inherit cmake xdg if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -40,6 +40,10 @@ BDEPEND=" sys-apps/lsb-release " +PATCHES=( + "${FILESDIR}/${PN}-1.0.18-nostrip.patch" # bug 745255 +) + src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare } diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild index 7057d336d41..6ef5cab3894 100644 --- a/app-text/xournalpp/xournalpp-9999.ebuild +++ b/app-text/xournalpp/xournalpp-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils xdg +inherit cmake xdg if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -41,5 +41,5 @@ BDEPEND=" " src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare }