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 DFA5E138806 for ; Mon, 25 Dec 2017 19:17:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB2CCE0CCD; Mon, 25 Dec 2017 19:17:40 +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 89E87E0CCD for ; Mon, 25 Dec 2017 19:17:40 +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 D76E033BF3C for ; Mon, 25 Dec 2017 19:17:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 623F7AE96 for ; Mon, 25 Dec 2017 19:17:37 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1514229356.2c6097b4fc3e489c9c380e9f23497d099f772e1d.soap@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.2.9.ebuild app-text/zathura/zathura-0.3.7.ebuild app-text/zathura/zathura-9999.ebuild X-VCS-Directories: app-text/zathura/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 2c6097b4fc3e489c9c380e9f23497d099f772e1d X-VCS-Branch: master Date: Mon, 25 Dec 2017 19:17:37 +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-Archives-Salt: aefe49e7-3300-4f25-a98f-90f2f5872a80 X-Archives-Hash: 99d48d5e59b43a30eabf5f180fbdf97f commit: 2c6097b4fc3e489c9c380e9f23497d099f772e1d Author: David Seifert gentoo org> AuthorDate: Mon Dec 25 17:22:33 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Dec 25 19:15:56 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c6097b4 app-text/zathura: [QA] Port to git-r3 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-text/zathura/zathura-0.2.9.ebuild | 30 ++++++++++++++---------------- app-text/zathura/zathura-0.3.7.ebuild | 26 +++++++++++++------------- app-text/zathura/zathura-9999.ebuild | 28 +++++++++++++--------------- 3 files changed, 40 insertions(+), 44 deletions(-) diff --git a/app-text/zathura/zathura-0.2.9.ebuild b/app-text/zathura/zathura-0.2.9.ebuild index d72c7ba6207..c4bb49e027e 100644 --- a/app-text/zathura/zathura-0.2.9.ebuild +++ b/app-text/zathura/zathura-0.2.9.ebuild @@ -1,26 +1,24 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils fdo-mime multilib toolchain-funcs virtualx -[[ ${PV} == 9999* ]] && inherit git-2 +inherit eutils multilib toolchain-funcs virtualx xdg-utils + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git" + EGIT_BRANCH="develop" +else + KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux" + SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz" +fi DESCRIPTION="A highly customizable and functional document viewer" HOMEPAGE="http://pwmt.org/projects/zathura/" -if ! [[ ${PV} == 9999* ]]; then -SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz" -fi -EGIT_REPO_URI="git://git.pwmt.org/${PN}.git" -EGIT_BRANCH="develop" LICENSE="ZLIB" SLOT="0" -if ! [[ ${PV} == 9999* ]]; then -KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux" -else -KEYWORDS="" -fi IUSE="+magic sqlite test" RDEPEND=">=dev-libs/girara-0.2.2:3= @@ -34,7 +32,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig test? ( dev-libs/check )" -pkg_setup() { +src_configure() { myzathuraconf=( WITH_MAGIC=$(usex magic 1 0) WITH_SQLITE=$(usex sqlite 1 0) @@ -61,9 +59,9 @@ src_install() { } pkg_postinst() { - fdo-mime_desktop_database_update + xdg_desktop_database_update } pkg_postrm() { - fdo-mime_desktop_database_update + xdg_desktop_database_update } diff --git a/app-text/zathura/zathura-0.3.7.ebuild b/app-text/zathura/zathura-0.3.7.ebuild index ad77a66a0e0..8281cf21819 100644 --- a/app-text/zathura/zathura-0.3.7.ebuild +++ b/app-text/zathura/zathura-0.3.7.ebuild @@ -3,22 +3,22 @@ EAPI=5 -inherit eutils fdo-mime multilib toolchain-funcs virtualx -[[ ${PV} == 9999* ]] && inherit git-2 +inherit eutils multilib toolchain-funcs virtualx xdg-utils + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git" + EGIT_BRANCH="develop" +else + KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux" + SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz" +fi DESCRIPTION="A highly customizable and functional document viewer" HOMEPAGE="http://pwmt.org/projects/zathura/" -if ! [[ ${PV} == 9999* ]]; then -SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz" -fi -EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" -EGIT_BRANCH="develop" LICENSE="ZLIB" SLOT="0" -if ! [[ ${PV} == 9999* ]]; then -KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux" -fi IUSE="+magic sqlite synctex test" RDEPEND=">=dev-libs/girara-0.2.7:3= @@ -39,7 +39,7 @@ src_prepare() { epatch_user } -pkg_setup() { +src_configure() { myzathuraconf=( WITH_MAGIC=$(usex magic 1 0) WITH_SQLITE=$(usex sqlite 1 0) @@ -67,9 +67,9 @@ src_install() { } pkg_postinst() { - fdo-mime_desktop_database_update + xdg_desktop_database_update } pkg_postrm() { - fdo-mime_desktop_database_update + xdg_desktop_database_update } diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild index 52a3a9c5d86..70f20b7aed6 100644 --- a/app-text/zathura/zathura-9999.ebuild +++ b/app-text/zathura/zathura-9999.ebuild @@ -3,24 +3,22 @@ EAPI=5 -inherit eutils fdo-mime multilib toolchain-funcs virtualx -[[ ${PV} == 9999* ]] && inherit git-2 +inherit eutils multilib toolchain-funcs virtualx xdg-utils + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git" + EGIT_BRANCH="develop" +else + KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" + SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz" +fi DESCRIPTION="A highly customizable and functional document viewer" HOMEPAGE="http://pwmt.org/projects/zathura/" -if ! [[ ${PV} == 9999* ]]; then -SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz" -fi -EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" -EGIT_BRANCH="develop" LICENSE="ZLIB" SLOT="0" -if ! [[ ${PV} == 9999* ]]; then -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" -else -KEYWORDS="" -fi IUSE="+magic sqlite synctex test" RDEPEND=">=dev-libs/girara-0.2.7:3= @@ -35,7 +33,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig test? ( dev-libs/check )" -pkg_setup() { +src_configure() { myzathuraconf=( WITH_MAGIC=$(usex magic 1 0) WITH_SQLITE=$(usex sqlite 1 0) @@ -63,9 +61,9 @@ src_install() { } pkg_postinst() { - fdo-mime_desktop_database_update + xdg_desktop_database_update } pkg_postrm() { - fdo-mime_desktop_database_update + xdg_desktop_database_update }