diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-11-27 10:31:45 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-11-27 10:31:45 +0000 |
| commit | b851cafa3eeae823547b1710b5478771ca1fb090 (patch) | |
| tree | d07ebb3695aeb97551d4e4b15e67cff85caefe00 /app-text/zathura | |
| parent | Stable for amd64 wrt bug #490106 (diff) | |
| download | gentoo-2-b851cafa3eeae823547b1710b5478771ca1fb090.tar.gz gentoo-2-b851cafa3eeae823547b1710b5478771ca1fb090.tar.bz2 gentoo-2-b851cafa3eeae823547b1710b5478771ca1fb090.zip | |
synchronize 0.2.6 and 9999 for maintainability
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'app-text/zathura')
| -rw-r--r-- | app-text/zathura/ChangeLog | 4 | ||||
| -rw-r--r-- | app-text/zathura/zathura-0.2.6.ebuild | 22 | ||||
| -rw-r--r-- | app-text/zathura/zathura-9999.ebuild | 16 |
3 files changed, 31 insertions, 11 deletions
diff --git a/app-text/zathura/ChangeLog b/app-text/zathura/ChangeLog index d2bacc86c096..b03f3124ef38 100644 --- a/app-text/zathura/ChangeLog +++ b/app-text/zathura/ChangeLog @@ -1,11 +1,11 @@ # ChangeLog for app-text/zathura # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/ChangeLog,v 1.53 2013/11/27 10:12:02 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/ChangeLog,v 1.54 2013/11/27 10:31:45 ssuominen Exp $ *zathura-0.2.6 (27 Nov 2013) 27 Nov 2013; Samuli Suominen <ssuominen@gentoo.org> +zathura-0.2.6.ebuild, - metadata.xml: + zathura-9999.ebuild, metadata.xml: Version bump wrt #483268 by Petr Pisar *zathura-9999 (22 Jun 2013) diff --git a/app-text/zathura/zathura-0.2.6.ebuild b/app-text/zathura/zathura-0.2.6.ebuild index afd3c64a23f7..6ef7d2778d4f 100644 --- a/app-text/zathura/zathura-0.2.6.ebuild +++ b/app-text/zathura/zathura-0.2.6.ebuild @@ -1,23 +1,33 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.2.6.ebuild,v 1.1 2013/11/27 10:12:02 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.2.6.ebuild,v 1.2 2013/11/27 10:31:45 ssuominen Exp $ EAPI=5 inherit eutils fdo-mime multilib toolchain-funcs virtualx +[[ ${PV} == 9999* ]] && inherit git-2 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" -IUSE="+doc magic sqlite test" +else +KEYWORDS="" +fi +IUSE="+doc +deprecated magic sqlite test" -RDEPEND=">=dev-libs/girara-0.1.8:2 - >=dev-libs/glib-2.28:2 - x11-libs/cairo +RDEPEND="dev-libs/glib:2 + x11-libs/cairo:= + deprecated? ( >=dev-libs/girara-0.1.6:2 ) + !deprecated? ( >=dev-libs/girara-0.1.6:3 ) magic? ( sys-apps/file ) sqlite? ( dev-db/sqlite:3 )" DEPEND="${RDEPEND} @@ -28,7 +38,7 @@ DEPEND="${RDEPEND} pkg_setup() { myzathuraconf=( - ZATHURA_GTK_VERSION=2 + ZATHURA_GTK_VERSION=$(usex deprecated 2 3) WITH_MAGIC=$(usex magic 1 0) WITH_SQLITE=$(usex sqlite 1 0) PREFIX="${EPREFIX}"/usr diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild index 015c412a287d..df4a5ff8de0a 100644 --- a/app-text/zathura/zathura-9999.ebuild +++ b/app-text/zathura/zathura-9999.ebuild @@ -1,25 +1,34 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-9999.ebuild,v 1.1 2013/06/22 13:05:38 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-9999.ebuild,v 1.2 2013/11/27 10:31:45 ssuominen Exp $ EAPI=5 -inherit eutils fdo-mime git-2 multilib toolchain-funcs virtualx +inherit eutils fdo-mime multilib toolchain-funcs virtualx +[[ ${PV} == 9999* ]] && inherit git-2 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="" -IUSE="+doc +deprecated sqlite test" +fi +IUSE="+doc +deprecated magic sqlite test" RDEPEND="dev-libs/glib:2 x11-libs/cairo:= deprecated? ( >=dev-libs/girara-0.1.6:2 ) !deprecated? ( >=dev-libs/girara-0.1.6:3 ) + magic? ( sys-apps/file ) sqlite? ( dev-db/sqlite:3 )" DEPEND="${RDEPEND} sys-devel/gettext @@ -30,6 +39,7 @@ DEPEND="${RDEPEND} pkg_setup() { myzathuraconf=( ZATHURA_GTK_VERSION=$(usex deprecated 2 3) + WITH_MAGIC=$(usex magic 1 0) WITH_SQLITE=$(usex sqlite 1 0) PREFIX="${EPREFIX}"/usr LIBDIR='${PREFIX}'/$(get_libdir) |