public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ole Reifschneider" <tranquility@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: app-text/evince/
Date: Sun, 27 Mar 2016 21:24:50 +0000 (UTC)	[thread overview]
Message-ID: <1459034595.11abb7d25360b0b48d1f2ab266ab8d1995ac67dc.tranquility@gentoo> (raw)

commit:     11abb7d25360b0b48d1f2ab266ab8d1995ac67dc
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 23:23:15 2016 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> 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 @@
 	<use>
 		<flag name="dvi">Enable the built-in DVI viewer</flag>
 		<flag name="libsecret">Enable support for credentials store</flag>
-		<flag name="multimedia">Enable multimedia support</flag>
 		<flag name="nautilus">Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag>
 		<flag name="t1lib">Enable the Type-1 fonts for the built-in DVI viewer
 			(<pkg>media-libs/t1lib</pkg>)</flag>


             reply	other threads:[~2016-03-27 21:24 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-27 21:24 Ole Reifschneider [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-08-05  9:59 [gentoo-commits] proj/gnome:master commit in: app-text/evince/ Mart Raudsepp
2018-08-05  9:59 Mart Raudsepp
2018-05-26 19:35 Gilles Dartiguelongue
2018-05-26 19:35 Gilles Dartiguelongue
2018-05-26 19:35 Gilles Dartiguelongue
2018-01-28 20:01 Sobhan Mohammadpour
2018-01-12  8:29 Dennis Lamm
2016-02-20 20:55 Mart Raudsepp
2015-10-18 10:25 Michał Górny
2015-10-14 19:34 Ole Reifschneider
2015-10-13 20:03 Ole Reifschneider
2015-10-12 20:34 Ole Reifschneider
2015-10-11 20:46 Ole Reifschneider
2014-10-15 22:26 Gilles Dartiguelongue
2014-04-23 22:14 Gilles Dartiguelongue
2014-04-07 21:25 Gilles Dartiguelongue
2013-12-18 22:49 Gilles Dartiguelongue
2013-11-16 16:21 Gilles Dartiguelongue
2013-11-15 23:20 Gilles Dartiguelongue
2012-12-27 16:51 Alexandre Rostovtsev
2012-12-01 14:17 Gilles Dartiguelongue
2012-10-15  9:44 Alexandre Rostovtsev
2012-09-21  3:25 Priit Laes
2012-09-21  0:27 Nirbheek Chauhan
2012-09-02 18:59 Nirbheek Chauhan
2012-06-23  9:05 Gilles Dartiguelongue
2012-05-13  0:32 Alexandre Restovtsev
2012-05-05  3:01 Alexandre Restovtsev
2012-03-31  9:14 Nirbheek Chauhan
2012-03-15 15:44 Nirbheek Chauhan
2011-11-03  5:34 Alexandre Restovtsev
2011-10-18  7:37 Alexandre Restovtsev
2011-10-14 19:09 Alexandre Restovtsev
2011-05-30 17:11 Nirbheek Chauhan
2011-04-10 18:04 Gilles Dartiguelongue
2011-04-05  0:57 Nirbheek Chauhan
2011-03-26  0:37 Nirbheek Chauhan
2011-03-22  1:18 Nirbheek Chauhan
2011-02-22 13:27 Nirbheek Chauhan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459034595.11abb7d25360b0b48d1f2ab266ab8d1995ac67dc.tranquility@gentoo \
    --to=tranquility@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox