From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 54E09138010 for ; Sun, 2 Sep 2012 19:01:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E85DDE0665; Sun, 2 Sep 2012 18:59:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A7A7BE0665 for ; Sun, 2 Sep 2012 18:59:59 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E360433D83A for ; Sun, 2 Sep 2012 18:59:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EE683E544B for ; Sun, 2 Sep 2012 18:59:56 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1346611818.2625a90fbf5bf26078d478423be7d7a396bea60b.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: app-text/evince/ X-VCS-Repository: proj/gnome X-VCS-Files: app-text/evince/evince-3.5.90.ebuild app-text/evince/evince-9999.ebuild X-VCS-Directories: app-text/evince/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 2625a90fbf5bf26078d478423be7d7a396bea60b X-VCS-Branch: master Date: Sun, 2 Sep 2012 18:59:56 +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: f222bbad-25ea-453b-a8ee-7a0f52811aff X-Archives-Hash: 18d4f937ef199d9be2674898ba7dd8ae commit: 2625a90fbf5bf26078d478423be7d7a396bea60b Author: Nirbheek Chauhan gentoo org> AuthorDate: Sun Sep 2 05:30:45 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Sun Sep 2 18:50:18 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2625a90f Add app-text/evince-3.5.90 --- .../{evince-9999.ebuild => evince-3.5.90.ebuild} | 21 +++++++++---------- app-text/evince/evince-9999.ebuild | 21 +++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-3.5.90.ebuild similarity index 87% copy from app-text/evince/evince-9999.ebuild copy to app-text/evince/evince-3.5.90.ebuild index a52dc76..c34800e 100644 --- a/app-text/evince/evince-9999.ebuild +++ b/app-text/evince/evince-3.5.90.ebuild @@ -30,7 +30,7 @@ fi # libX11 used for totem-screensaver RDEPEND=" dev-libs/atk - >=dev-libs/glib-2.25.11:2 + >=dev-libs/glib-2.32.0:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib x11-libs/gdk-pixbuf:2 @@ -43,22 +43,20 @@ RDEPEND=" >=x11-themes/gnome-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 ) >=x11-libs/cairo-1.10.0 - >=app-text/poppler-0.18[cairo] + >=app-text/poppler-0.20.0[cairo] djvu? ( >=app-text/djvu-3.5.17 ) dvi? ( virtual/tex-base dev-libs/kpathsea t1lib? ( >=media-libs/t1lib-5.0.0 ) ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) - introspection? ( >=dev-libs/gobject-introspection-0.6 ) + introspection? ( >=dev-libs/gobject-introspection-1.0 ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2.0 ) tiff? ( >=media-libs/tiff-3.6:0 ) - xps? ( >=app-text/libgxps-0.2.1 ) -" + xps? ( >=app-text/libgxps-0.2.1 )" DEPEND="${RDEPEND} app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.3.2 app-text/docbook-xml-dtd:4.3 sys-devel/gettext >=dev-util/intltool-0.35 @@ -66,6 +64,11 @@ DEPEND="${RDEPEND} virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.13 )" +if [[ ${PV} = 9999 ]]; then + DEPEND="${DEPEND} + app-text/yelp-tools" +fi + ELTCONF="--portage" # Needs dogtail and pyspi from http://fedorahosted.org/dogtail/ @@ -96,15 +99,11 @@ pkg_setup() { $(use_enable t1lib) $(use_enable tiff) $(use_enable xps)" + [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" DOCS="AUTHORS ChangeLog NEWS README TODO" } src_prepare() { - # Regenerate marshalers to allow building with =x11-themes/gnome-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 ) >=x11-libs/cairo-1.10.0 - >=app-text/poppler-0.18[cairo] + >=app-text/poppler-0.20.0[cairo] djvu? ( >=app-text/djvu-3.5.17 ) dvi? ( virtual/tex-base dev-libs/kpathsea t1lib? ( >=media-libs/t1lib-5.0.0 ) ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) - introspection? ( >=dev-libs/gobject-introspection-0.6 ) + introspection? ( >=dev-libs/gobject-introspection-1.0 ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2.0 ) tiff? ( >=media-libs/tiff-3.6:0 ) - xps? ( >=app-text/libgxps-0.2.1 ) -" + xps? ( >=app-text/libgxps-0.2.1 )" DEPEND="${RDEPEND} app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.3.2 app-text/docbook-xml-dtd:4.3 sys-devel/gettext >=dev-util/intltool-0.35 @@ -66,6 +64,11 @@ DEPEND="${RDEPEND} virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.13 )" +if [[ ${PV} = 9999 ]]; then + DEPEND="${DEPEND} + app-text/yelp-tools" +fi + ELTCONF="--portage" # Needs dogtail and pyspi from http://fedorahosted.org/dogtail/ @@ -96,15 +99,11 @@ pkg_setup() { $(use_enable t1lib) $(use_enable tiff) $(use_enable xps)" + [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" DOCS="AUTHORS ChangeLog NEWS README TODO" } src_prepare() { - # Regenerate marshalers to allow building with