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 C400C15800A for ; Tue, 29 Aug 2023 01:31:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B59042BC015; Tue, 29 Aug 2023 01:31:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98EA22BC015 for ; Tue, 29 Aug 2023 01:31:18 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 761DA335D84 for ; Tue, 29 Aug 2023 01:31:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D48B41093 for ; Tue, 29 Aug 2023 01:31:15 +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: <1693272019.60fc99439f84122876d97f09357a15ed4aa92538.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/zathura/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/zathura/zathura-0.5.2-r4.ebuild app-text/zathura/zathura-0.5.2-r5.ebuild app-text/zathura/zathura-9999.ebuild X-VCS-Directories: app-text/zathura/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 60fc99439f84122876d97f09357a15ed4aa92538 X-VCS-Branch: master Date: Tue, 29 Aug 2023 01:31:15 +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: 85830ae5-9ffe-4d2c-ba6a-41a8eb68fbeb X-Archives-Hash: 03a62bdb3617108adce9d1d7d2b360c3 commit: 60fc99439f84122876d97f09357a15ed4aa92538 Author: Mason Rocha turret cyou> AuthorDate: Mon Aug 28 22:37:11 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Aug 29 01:20:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60fc9943 app-text/zathura: EAPI bump, use live template, fix test Signed-off-by: Mason Rocha turret.cyou> Signed-off-by: Sam James gentoo.org> ...ura-0.5.2-r4.ebuild => zathura-0.5.2-r5.ebuild} | 36 +++++++++++--------- app-text/zathura/zathura-9999.ebuild | 38 ++++++++++++++-------- 2 files changed, 45 insertions(+), 29 deletions(-) diff --git a/app-text/zathura/zathura-0.5.2-r4.ebuild b/app-text/zathura/zathura-0.5.2-r5.ebuild similarity index 74% rename from app-text/zathura/zathura-0.5.2-r4.ebuild rename to app-text/zathura/zathura-0.5.2-r5.ebuild index 249ff0cbb654..1ad4fe4776d4 100644 --- a/app-text/zathura/zathura-0.5.2-r4.ebuild +++ b/app-text/zathura/zathura-0.5.2-r5.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson virtualx xdg @@ -15,9 +15,9 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI=" https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}-manpages.tar.xz + https://cdn.turret.cyou/354c6d33bfd3bbc67c0047af1328498978eef352/${P}-manpages.tar.xz " - KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux" + KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux" fi LICENSE="ZLIB" @@ -26,22 +26,26 @@ IUSE="seccomp sqlite synctex test" RESTRICT="!test? ( test )" -DEPEND=">=dev-libs/girara-0.3.7 +DEPEND=" + >=dev-libs/girara-0.3.7 >=dev-libs/glib-2.50:2 + sys-apps/file >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 - sys-apps/file seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) - synctex? ( app-text/texlive-core )" - + synctex? ( app-text/texlive-core ) +" RDEPEND="${DEPEND}" - BDEPEND=" - test? ( dev-libs/appstream-glib - dev-libs/check ) - virtual/pkgconfig" + test? ( + dev-libs/appstream-glib + dev-libs/check + x11-base/xorg-server[xvfb] + ) + virtual/pkgconfig +" PATCHES=( "${FILESDIR}"/zathura-disable-seccomp-tests.patch @@ -58,11 +62,11 @@ src_configure() { meson_src_configure } -src_install() { - meson_src_install - doman "${WORKDIR}"/man/zathura* -} - src_test() { virtx meson_src_test } + +src_install() { + meson_src_install + [[ ${PV} != *9999 ]] && doman "${WORKDIR}"/man/zathura* +} diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild index 871f9948e8f7..1ad4fe4776d4 100644 --- a/app-text/zathura/zathura-9999.ebuild +++ b/app-text/zathura/zathura-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson virtualx xdg @@ -13,7 +13,10 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" EGIT_BRANCH="develop" else - SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz + https://cdn.turret.cyou/354c6d33bfd3bbc67c0047af1328498978eef352/${P}-manpages.tar.xz + " KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux" fi @@ -23,22 +26,26 @@ IUSE="seccomp sqlite synctex test" RESTRICT="!test? ( test )" -DEPEND=">=dev-libs/girara-0.3.7 +DEPEND=" + >=dev-libs/girara-0.3.7 >=dev-libs/glib-2.50:2 + sys-apps/file >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 - sys-apps/file seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) - synctex? ( app-text/texlive-core )" - + synctex? ( app-text/texlive-core ) +" RDEPEND="${DEPEND}" - -BDEPEND="dev-python/sphinx - test? ( dev-libs/appstream-glib - dev-libs/check ) - virtual/pkgconfig" +BDEPEND=" + test? ( + dev-libs/appstream-glib + dev-libs/check + x11-base/xorg-server[xvfb] + ) + virtual/pkgconfig +" PATCHES=( "${FILESDIR}"/zathura-disable-seccomp-tests.patch @@ -47,7 +54,7 @@ PATCHES=( src_configure() { local emesonargs=( -Dconvert-icon=disabled - -Dmanpages=enabled + -Dmanpages=disabled -Dseccomp=$(usex seccomp enabled disabled) -Dsqlite=$(usex sqlite enabled disabled) -Dsynctex=$(usex synctex enabled disabled) @@ -58,3 +65,8 @@ src_configure() { src_test() { virtx meson_src_test } + +src_install() { + meson_src_install + [[ ${PV} != *9999 ]] && doman "${WORKDIR}"/man/zathura* +}