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 2E0C659CA9 for ; Sun, 27 Mar 2016 21:24:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E38321C05B; Sun, 27 Mar 2016 21:24:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D7D421C04E for ; Sun, 27 Mar 2016 21:24:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9AD673404A5 for ; Sun, 27 Mar 2016 21:24:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2E7A852 for ; Sun, 27 Mar 2016 21:24:50 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1459034595.11abb7d25360b0b48d1f2ab266ab8d1995ac67dc.tranquility@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.20.0.ebuild app-text/evince/evince-9999.ebuild app-text/evince/metadata.xml X-VCS-Directories: app-text/evince/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: 11abb7d25360b0b48d1f2ab266ab8d1995ac67dc X-VCS-Branch: master Date: Sun, 27 Mar 2016 21:24:50 +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: 950a749f-b7cd-4d7a-b03d-1daf088f9a50 X-Archives-Hash: 32c3bae064849a54ffc4b78b85c89e47 commit: 11abb7d25360b0b48d1f2ab266ab8d1995ac67dc Author: Ole Reifschneider gentoo org> AuthorDate: Sat Mar 26 23:23:15 2016 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Sat Mar 26 23:23:15 2016 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=11abb7d2 app-text/evince: Bump version to 3.20.0 Package-Manager: portage-2.2.28 Manifest-Sign-Key: 0xE9E568677E8B4D42 .../{evince-9999.ebuild => evince-3.20.0.ebuild} | 52 ++++++++-------------- app-text/evince/evince-9999.ebuild | 24 +++++----- app-text/evince/metadata.xml | 1 - 3 files changed, 32 insertions(+), 45 deletions(-) diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-3.20.0.ebuild similarity index 66% copy from app-text/evince/evince-9999.ebuild copy to app-text/evince/evince-3.20.0.ebuild index 62271e1..0cd9075 100644 --- a/app-text/evince/evince-9999.ebuild +++ b/app-text/evince/evince-3.20.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -7,9 +7,6 @@ GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" inherit gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi DESCRIPTION="Simple document viewer for GNOME" HOMEPAGE="https://wiki.gnome.org/Apps/Evince" @@ -17,13 +14,8 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evince" LICENSE="GPL-2+ CC-BY-SA-3.0" # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) SLOT="0/evd3.4-evv3.3" -IUSE="djvu dvi gnome +introspection libsecret multimedia nautilus nsplugin +postscript t1lib tiff xps" -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris" -fi +IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris" # Since 2.26.2, can handle poppler without cairo support. Make it optional ? # not mature enough @@ -39,16 +31,19 @@ COMMON_DEPEND=" >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= - >=app-text/poppler-0.24[cairo] - djvu? ( >=app-text/djvu-3.5.17:= ) + >=app-text/poppler-0.33[cairo] + djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) - introspection? ( >=dev-libs/gobject-introspection-1 ) - libsecret? ( >=app-crypt/libsecret-0.5 ) - multimedia? ( media-libs/gstreamer:1.0= ) + gnome-keyring? ( >=app-crypt/libsecret-0.5 ) + introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) @@ -59,9 +54,8 @@ RDEPEND="${COMMON_DEPEND} gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 - >=x11-themes/gnome-icon-theme-2.17.1 + ( >=x11-themes/gnome-icon-theme-2.17.1 x11-themes/gnome-icon-theme-symbolic ) >=x11-themes/hicolor-icon-theme-0.10 ) - x11-themes/gnome-icon-theme-symbolic " DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.3 @@ -69,19 +63,12 @@ DEPEND="${COMMON_DEPEND} dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.35 + dev-util/itstool sys-devel/gettext virtual/pkgconfig " - -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - app-text/yelp-tools - doc? ( >=dev-util/gtk-doc-1.13 )" -fi - -# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/ -# Releases: http://people.redhat.com/zcerza/dogtail/releases/ -#RESTRICT="test" +# eautoreconf needs: +# app-text/yelp-tools src_prepare() { gnome2_src_prepare @@ -93,8 +80,6 @@ src_prepare() { } src_configure() { - local myconf="" - [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)" gnome2_src_configure \ --disable-static \ --enable-pdf \ @@ -104,16 +89,15 @@ src_configure() { --enable-dbus \ $(use_enable djvu) \ $(use_enable dvi) \ - $(use_with libsecret keyring) \ + $(use_enable gstreamer multimedia) \ $(use_enable gnome libgnome-desktop) \ + $(use_with gnome-keyring keyring) \ $(use_enable introspection) \ - $(use_enable multimedia) \ $(use_enable nautilus) \ $(use_enable nsplugin browser-plugin) \ $(use_enable postscript ps) \ $(use_enable t1lib) \ $(use_enable tiff) \ $(use_enable xps) \ - BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \ - ${myconf} + BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins } diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-9999.ebuild index 62271e1..6682dba 100644 --- a/app-text/evince/evince-9999.ebuild +++ b/app-text/evince/evince-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,7 +17,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evince" LICENSE="GPL-2+ CC-BY-SA-3.0" # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) SLOT="0/evd3.4-evv3.3" -IUSE="djvu dvi gnome +introspection libsecret multimedia nautilus nsplugin +postscript t1lib tiff xps" +IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps" if [[ ${PV} = 9999 ]]; then IUSE="${IUSE} doc" KEYWORDS="" @@ -39,16 +39,19 @@ COMMON_DEPEND=" >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= - >=app-text/poppler-0.24[cairo] - djvu? ( >=app-text/djvu-3.5.17:= ) + >=app-text/poppler-0.33[cairo] + djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) - introspection? ( >=dev-libs/gobject-introspection-1 ) - libsecret? ( >=app-crypt/libsecret-0.5 ) - multimedia? ( media-libs/gstreamer:1.0= ) + gnome-keyring? ( >=app-crypt/libsecret-0.5 ) + introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) @@ -59,7 +62,7 @@ RDEPEND="${COMMON_DEPEND} gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 - >=x11-themes/gnome-icon-theme-2.17.1 + ( >=x11-themes/gnome-icon-theme-2.17.1 x11-themes/gnome-icon-theme-symbolic ) >=x11-themes/hicolor-icon-theme-0.10 ) x11-themes/gnome-icon-theme-symbolic " @@ -69,6 +72,7 @@ DEPEND="${COMMON_DEPEND} dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.35 + dev-util/itstool sys-devel/gettext virtual/pkgconfig " @@ -104,10 +108,10 @@ src_configure() { --enable-dbus \ $(use_enable djvu) \ $(use_enable dvi) \ - $(use_with libsecret keyring) \ + $(use_enable gstreamer multimedia) \ $(use_enable gnome libgnome-desktop) \ + $(use_with gnome-keyring keyring) \ $(use_enable introspection) \ - $(use_enable multimedia) \ $(use_enable nautilus) \ $(use_enable nsplugin browser-plugin) \ $(use_enable postscript ps) \ diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml index 96e3660..115a0ee 100644 --- a/app-text/evince/metadata.xml +++ b/app-text/evince/metadata.xml @@ -8,7 +8,6 @@ Enable the built-in DVI viewer Enable support for credentials store - Enable multimedia support Enable property page extension in gnome-base/nautilus Enable the Type-1 fonts for the built-in DVI viewer (media-libs/t1lib)