app-text/zathura: [QA] Port to git-r3

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/app-text/zathura/zathura-0.2.9.ebuild b/app-text/zathura/zathura-0.2.9.ebuild
index d72c7ba6207f46678d0077d396690069d0248735..c4bb49e027ef5cb88b7ee6bbef2bd2c24df7b7a9 100644 (file)
--- 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 ad77a66a0e0e7658d4b95265b1a585f89fc7fbcb..8281cf21819d9c5f6dd164da05a9e0b62486cad1 100644 (file)
--- 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 52a3a9c5d867baf068c5a6a601d5957b0a7ebaca..70f20b7aed6342e4d033f89410d7f008a9b34e8e 100644 (file)
--- 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
 }