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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9CB60158003 for ; Wed, 7 Dec 2022 13:59:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCB67E07D0; Wed, 7 Dec 2022 13:59:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1014E07D0 for ; Wed, 7 Dec 2022 13:59:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1BB3341407 for ; Wed, 7 Dec 2022 13:59:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 686DD771 for ; Wed, 7 Dec 2022 13:59:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1670421535.48a522381cf0f031d4b3b7cdc766ab2d85260265.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xournal/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/xournal/xournal-0.4.8.2016-r1.ebuild app-text/xournal/xournal-9999.ebuild X-VCS-Directories: app-text/xournal/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 48a522381cf0f031d4b3b7cdc766ab2d85260265 X-VCS-Branch: master Date: Wed, 7 Dec 2022 13:59:49 +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: 493b088d-0044-46dd-b677-d4785109d824 X-Archives-Hash: be03a2d188ce718b9e436e1a67c8e228 commit: 48a522381cf0f031d4b3b7cdc766ab2d85260265 Author: Sam James gentoo org> AuthorDate: Wed Dec 7 13:58:38 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Dec 7 13:58:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48a52238 app-text/xournal: EAPI 8 Bug: https://bugs.gentoo.org/875158 Signed-off-by: Sam James gentoo.org> app-text/xournal/xournal-0.4.8.2016-r1.ebuild | 19 +++++++++--------- app-text/xournal/xournal-9999.ebuild | 29 +++++++++++++++++---------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/app-text/xournal/xournal-0.4.8.2016-r1.ebuild b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild index eb0427c142d3..3ebf59e8631a 100644 --- a/app-text/xournal/xournal-0.4.8.2016-r1.ebuild +++ b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 [[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code" unset SRC_URI else - KEYWORDS="amd64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~ppc64 ~x86" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" fi @@ -23,7 +23,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="+pdf vanilla" -COMMONDEPEND=" +DEPEND=" app-text/poppler[cairo] dev-libs/atk dev-libs/glib @@ -36,27 +36,26 @@ COMMONDEPEND=" x11-libs/gtk+:2 x11-libs/pango " -RDEPEND="${COMMONDEPEND} +RDEPEND=" + ${DEPEND} pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) " -DEPEND="${COMMONDEPEND} - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}"-0.4.8-c99-fix.patch ) src_prepare() { - default_src_prepare + default + if ! use vanilla; then eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch fi } src_install() { - emake DESTDIR="${D}" install - emake DESTDIR="${D}" desktop-install + emake DESTDIR="${D}" install desktop-install dodoc ChangeLog AUTHORS README dodoc -r html-doc/* diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild index 5afafb130f7e..d7fc7a1b87ab 100644 --- a/app-text/xournal/xournal-9999.ebuild +++ b/app-text/xournal/xournal-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 [[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code" unset SRC_URI else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~ppc64 ~x86" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" fi @@ -21,9 +21,9 @@ HOMEPAGE="http://xournal.sourceforge.net/" LICENSE="GPL-2" SLOT="0" -IUSE="+pdf" +IUSE="+pdf vanilla" -COMMONDEPEND=" +DEPEND=" app-text/poppler[cairo] dev-libs/atk dev-libs/glib @@ -36,16 +36,23 @@ COMMONDEPEND=" x11-libs/gtk+:2 x11-libs/pango " -RDEPEND="${COMMONDEPEND} +RDEPEND=" + ${DEPEND} pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) " -DEPEND="${COMMONDEPEND} - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" -src_install() { +src_prepare() { default - emake DESTDIR="${D}" desktop-install + if ! use vanilla; then + eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch + fi +} + +src_install() { + emake DESTDIR="${D}" install desktop-install + + dodoc ChangeLog AUTHORS README dodoc -r html-doc/* }