public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: app-text/evince/files/, app-text/evince/
@ 2012-12-16 13:03 Gilles Dartiguelongue
  0 siblings, 0 replies; 5+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-16 13:03 UTC (permalink / raw
  To: gentoo-commits

commit:     9c079594e626e1de2ed5a6a670273f6265542437
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 13:03:14 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 13:03:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9c079594

app-text/evince: moved to gentoo-x86

---
 app-text/evince/evince-3.6.1.ebuild                |  113 --------------------
 .../evince/files/evince-3.6.0-evince.desktop.patch |   26 -----
 2 files changed, 0 insertions(+), 139 deletions(-)

diff --git a/app-text/evince/evince-3.6.1.ebuild b/app-text/evince/evince-3.6.1.ebuild
deleted file mode 100644
index 5fd5958..0000000
--- a/app-text/evince/evince-3.6.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="dbus debug djvu dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
-# not mature enough
-# atk used in libview
-# gdk-pixbuf used all over the place
-# libX11 used for totem-screensaver
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.33.0:2
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0.2:3[introspection?]
-	x11-libs/libX11
-	>=x11-libs/libSM-1
-	x11-libs/libICE
-	gnome-base/gsettings-desktop-schemas
-	|| (
-		>=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.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-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 )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.13
-	virtual/pkgconfig"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-		doc? ( >=dev-util/gtk-doc-1.13 )"
-fi
-
-ELTCONF="--portage"
-
-# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
-# Releases: http://people.redhat.com/zcerza/dogtail/releases/
-RESTRICT="test"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--disable-static
-		--disable-tests
-		--enable-pdf
-		--enable-comics
-		--enable-thumbnailer
-		--with-smclient=xsmp
-		--with-platform=gnome
-		$(use_enable dbus)
-		$(use_enable djvu)
-		$(use_enable dvi)
-		$(use_with gnome-keyring keyring)
-		$(use_enable introspection)
-		$(use_enable nautilus)
-		$(use_enable postscript ps)
-		$(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() {
-	# Fix .desktop file so menu item shows up
-	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
-
-	# Fix .desktop file categories, in 3.7
-	epatch "${FILESDIR}/${PN}-3.6.0-evince.desktop.patch"
-
-	gnome2_src_prepare
-	# Do not depend on gnome-icon-theme, bug #326855, #391859
-	sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}

diff --git a/app-text/evince/files/evince-3.6.0-evince.desktop.patch b/app-text/evince/files/evince-3.6.0-evince.desktop.patch
deleted file mode 100644
index 8fb7295..0000000
--- a/app-text/evince/files/evince-3.6.0-evince.desktop.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a9f7ae46f2ea3d78cb53db4f0aad69bc7d0d163a Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 12 Oct 2012 19:15:18 -0400
-Subject: [PATCH] evince.desktop: add 2DGraphics category
-
-Needed to pass validation with desktop-file-utils-0.20
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686062
----
- data/evince.desktop.in.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/evince.desktop.in.in b/data/evince.desktop.in.in
-index 7106d97..e38497e 100644
---- a/data/evince.desktop.in.in
-+++ b/data/evince.desktop.in.in
-@@ -13,5 +13,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=evince
- X-GNOME-Bugzilla-Component=BugBuddyBugs
- X-GNOME-Bugzilla-Version=@VERSION@
--Categories=GNOME;GTK;Office;Viewer;Graphics;VectorGraphics;
-+Categories=GNOME;GTK;Office;Viewer;Graphics;2DGraphics;VectorGraphics;
- MimeType=@EVINCE_MIME_TYPES@
--- 
-1.7.12.3
-


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: app-text/evince/files/, app-text/evince/
@ 2015-05-27 13:28 Alexandre Rostovtsev
  0 siblings, 0 replies; 5+ messages in thread
From: Alexandre Rostovtsev @ 2015-05-27 13:28 UTC (permalink / raw
  To: gentoo-commits

commit:     334f92c3ec768dd985807823f71ab18c2723a152
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 13:24:32 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed May 27 13:24:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=334f92c3

app-text/evince: 3.16.0 → 3.16.1

Clean up patch that was accepted upstream.

Package-Manager: portage-2.2.20
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

 .../{evince-3.16.0.ebuild => evince-3.16.1.ebuild} |  0
 app-text/evince/evince-9999.ebuild                 |  6 +----
 .../files/evince-3.14.0-non-bash-support.patch     | 28 ----------------------
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/app-text/evince/evince-3.16.0.ebuild b/app-text/evince/evince-3.16.1.ebuild
similarity index 100%
rename from app-text/evince/evince-3.16.0.ebuild
rename to app-text/evince/evince-3.16.1.ebuild

diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-9999.ebuild
index d0e00c2..57bb06b 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -83,10 +83,6 @@ fi
 #RESTRICT="test"
 
 src_prepare() {
-	# Fix build with non-bash /bin/sh, see bug #526410
-	epatch "${FILESDIR}"/${PN}-3.14.0-non-bash-support.patch
-
-	eautoreconf
 	gnome2_src_prepare
 
 	# Do not depend on adwaita-icon-theme, bug #326855, #391859

diff --git a/app-text/evince/files/evince-3.14.0-non-bash-support.patch b/app-text/evince/files/evince-3.14.0-non-bash-support.patch
deleted file mode 100644
index 979d186..0000000
--- a/app-text/evince/files/evince-3.14.0-non-bash-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 59daf398bc0f1d7895eee3a776b33a9c9310ad21 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Sun, 26 Oct 2014 23:54:47 +0300
-Subject: configure.ac: workaround quoting issues
-
-BROWSER_PLUGIN_DIR variable substitution is not portable. In particular
-it does not work in dash. Replace it with conditional.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=739226
-
-diff --git a/configure.ac b/configure.ac
-index 56bf93c..dd4bcab 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -455,7 +455,9 @@ AC_ARG_ENABLE([browser-plugin],
- if test x$enable_browser_plugin = "xyes" ; then
-   PKG_CHECK_MODULES([BROWSER_PLUGIN],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED])
- 
--  BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
-+  if test -z "${BROWSER_PLUGIN_DIR}"; then
-+    BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins"
-+  fi
-   AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
- fi
- 
--- 
-cgit v0.10.1
-


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: app-text/evince/files/, app-text/evince/
@ 2014-12-21 13:28 Gilles Dartiguelongue
  0 siblings, 0 replies; 5+ messages in thread
From: Gilles Dartiguelongue @ 2014-12-21 13:28 UTC (permalink / raw
  To: gentoo-commits

commit:     3805be6c8911066c6e27dd15eebf73bdec17fb24
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 21 12:07:39 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 21 12:14:30 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3805be6c

app-text/evince: moved to gentoo-x86, sync live ebuild

---
 app-text/evince/evince-3.14.1.ebuild               | 103 ---------------------
 app-text/evince/evince-9999.ebuild                 |   9 +-
 ....patch => evince-3.14.0-non-bash-support.patch} |   0
 3 files changed, 6 insertions(+), 106 deletions(-)

diff --git a/app-text/evince/evince-3.14.1.ebuild b/app-text/evince/evince-3.14.1.ebuild
deleted file mode 100644
index 0ed7b71..0000000
--- a/app-text/evince/evince-3.14.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils autotools gnome2
-
-DESCRIPTION="Simple document viewer for GNOME"
-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="debug djvu dvi gnome +introspection libsecret nautilus +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
-# atk used in libview
-# gdk-pixbuf used all over the place
-# libX11 used for totem-screensaver
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14: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:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gnome? ( gnome-base/gnome-desktop:3 )
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	libsecret? ( >=app-crypt/libsecret-0.5 )
-	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/gnome-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
-# Releases: http://people.redhat.com/zcerza/dogtail/releases/
-RESTRICT="test"
-
-src_prepare() {
-	# Fix build with non-bash /bin/sh, see bug #526410
-	epatch "${FILESDIR}/${PN}-non-bash-support.patch"
-
-	eautoreconf
-
-	gnome2_src_prepare
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tests \
-		--enable-pdf \
-		--enable-comics \
-		--enable-thumbnailer \
-		--with-platform=gnome \
-		--enable-dbus \
-		--enable-browser-plugin \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_with libsecret keyring) \
-		$(use_enable gnome libgnome-desktop) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps) \
-		ITSTOOL=$(type -P true)
-}

diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-9999.ebuild
index 49309f4..0f581af 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-9999.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	>=dev-libs/libxml2-2.5:2
 	sys-libs/zlib:=
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.12:3[introspection?]
+	>=x11-libs/gtk+-3.14:3[introspection?]
 	gnome-base/gsettings-desktop-schemas
 	>=x11-libs/cairo-1.10:=
 	>=app-text/poppler-0.24:=[cairo]
@@ -76,13 +76,15 @@ if [[ ${PV} = 9999 ]]; then
 		doc? ( >=dev-util/gtk-doc-1.13 )"
 fi
 
-ELTCONF="--portage"
-
 # Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
 # Releases: http://people.redhat.com/zcerza/dogtail/releases/
 RESTRICT="test"
 
 src_prepare() {
+	# Fix build with non-bash /bin/sh, see bug #526410
+	epatch "${FILESDIR}"/${PN}-3.14.0-non-bash-support.patch
+
+	eautoreconf
 	gnome2_src_prepare
 
 	# Do not depend on adwaita-icon-theme, bug #326855, #391859
@@ -112,5 +114,6 @@ src_configure() {
 		$(use_enable t1lib) \
 		$(use_enable tiff) \
 		$(use_enable xps) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
 		${myconf}
 }

diff --git a/app-text/evince/files/evince-non-bash-support.patch b/app-text/evince/files/evince-3.14.0-non-bash-support.patch
similarity index 100%
rename from app-text/evince/files/evince-non-bash-support.patch
rename to app-text/evince/files/evince-3.14.0-non-bash-support.patch


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: app-text/evince/files/, app-text/evince/
@ 2013-10-13 11:15 Gilles Dartiguelongue
  0 siblings, 0 replies; 5+ messages in thread
From: Gilles Dartiguelongue @ 2013-10-13 11:15 UTC (permalink / raw
  To: gentoo-commits

commit:     1f3d5ff233cc3bb64f3393b4e08303837f4f1890
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 11:09:22 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 11:15:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1f3d5ff2

app-text/evince: 3.8.3 → 3.10.0

---
 .../{evince-9999.ebuild => evince-3.10.0.ebuild}   | 92 ++++++++++------------
 app-text/evince/evince-9999.ebuild                 | 76 ++++++++++--------
 .../evince/files/evince-0.7.1-display-menu.patch   | 11 ---
 3 files changed, 83 insertions(+), 96 deletions(-)

diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-3.10.0.ebuild
similarity index 56%
copy from app-text/evince/evince-9999.ebuild
copy to app-text/evince/evince-3.10.0.ebuild
index dcb8f66..ac33965 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-3.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,58 +7,53 @@ GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://www.gnome.org/projects/evince/"
 
-LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
+LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
-IUSE="debug djvu dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
-fi
+IUSE="debug djvu dvi +introspection libsecret nautilus +postscript t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~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
 # atk used in libview
 # gdk-pixbuf used all over the place
 # libX11 used for totem-screensaver
-RDEPEND="
+COMMON_DEPEND="
 	dev-libs/atk
-	>=dev-libs/glib-2.33:2
+	>=dev-libs/glib-2.36:2
 	>=dev-libs/libxml2-2.5:2
 	sys-libs/zlib:=
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0.2:3[introspection?]
+	>=x11-libs/gtk+-3.8:3[introspection?]
 	x11-libs/libX11:=
 	>=x11-libs/libSM-1:=
 	x11-libs/libICE:=
 	gnome-base/gsettings-desktop-schemas
-	|| (
-		>=x11-themes/gnome-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
 	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.20:=[cairo]
+	>=app-text/poppler-0.24:=[cairo]
 	djvu? ( >=app-text/djvu-3.5.17:= )
 	dvi? (
 		virtual/tex-base
 		dev-libs/kpathsea:=
 		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
 	introspection? ( >=dev-libs/gobject-introspection-1 )
+	libsecret? ( >=app-crypt/libsecret-0.5 )
 	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:= )
 "
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		>=x11-themes/gnome-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.3
 	dev-util/gdbus-codegen
 	sys-devel/gettext
@@ -66,44 +61,39 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig"
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-		doc? ( >=dev-util/gtk-doc-1.13 )"
-fi
-
-ELTCONF="--portage"
-
 # Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
 # Releases: http://people.redhat.com/zcerza/dogtail/releases/
 RESTRICT="test"
 
 src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tests
-		--enable-pdf
-		--enable-comics
-		--enable-thumbnailer
-		--with-smclient=xsmp
-		--with-platform=gnome
-		--enable-dbus
-		$(use_enable djvu)
-		$(use_enable dvi)
-		$(use_with gnome-keyring keyring)
-		$(use_enable introspection)
-		$(use_enable nautilus)
-		$(use_enable postscript ps)
-		$(use_enable t1lib)
-		$(use_enable tiff)
-		$(use_enable xps)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-
-	# Fix .desktop file so menu item shows up
-	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
+	# ???
+	ELTCONF="--portage"
 
 	gnome2_src_prepare
+
 	# Do not depend on gnome-icon-theme, bug #326855, #391859
 	sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
 		-i configure || die "sed failed"
 }
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tests \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-smclient=xsmp \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_with libsecret keyring) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		ITSTOOL=$(type -P true)
+}

diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-9999.ebuild
index dcb8f66..f9a19a9 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -14,10 +14,10 @@ fi
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://www.gnome.org/projects/evince/"
 
-LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
+LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
-IUSE="debug djvu dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
+IUSE="debug djvu dvi +introspection libsecret nautilus +postscript t1lib tiff xps"
 if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
@@ -30,35 +30,38 @@ fi
 # atk used in libview
 # gdk-pixbuf used all over the place
 # libX11 used for totem-screensaver
-RDEPEND="
+COMMON_DEPEND="
 	dev-libs/atk
-	>=dev-libs/glib-2.33:2
+	>=dev-libs/glib-2.36:2
 	>=dev-libs/libxml2-2.5:2
 	sys-libs/zlib:=
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0.2:3[introspection?]
+	>=x11-libs/gtk+-3.8:3[introspection?]
 	x11-libs/libX11:=
 	>=x11-libs/libSM-1:=
 	x11-libs/libICE:=
 	gnome-base/gsettings-desktop-schemas
-	|| (
-		>=x11-themes/gnome-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
 	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.20:=[cairo]
+	>=app-text/poppler-0.24:=[cairo]
 	djvu? ( >=app-text/djvu-3.5.17:= )
 	dvi? (
 		virtual/tex-base
 		dev-libs/kpathsea:=
 		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
 	introspection? ( >=dev-libs/gobject-introspection-1 )
+	libsecret? ( >=app-crypt/libsecret-0.5 )
 	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:= )
 "
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		>=x11-themes/gnome-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.3
 	dev-util/gdbus-codegen
 	sys-devel/gettext
@@ -79,31 +82,36 @@ ELTCONF="--portage"
 RESTRICT="test"
 
 src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tests
-		--enable-pdf
-		--enable-comics
-		--enable-thumbnailer
-		--with-smclient=xsmp
-		--with-platform=gnome
-		--enable-dbus
-		$(use_enable djvu)
-		$(use_enable dvi)
-		$(use_with gnome-keyring keyring)
-		$(use_enable introspection)
-		$(use_enable nautilus)
-		$(use_enable postscript ps)
-		$(use_enable t1lib)
-		$(use_enable tiff)
-		$(use_enable xps)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-
-	# Fix .desktop file so menu item shows up
-	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
+	# ???
+	ELTCONF="--portage"
 
 	gnome2_src_prepare
+
 	# Do not depend on gnome-icon-theme, bug #326855, #391859
 	sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
 		-i configure || die "sed failed"
 }
+
+src_configure() {
+	local myconf=""
+	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tests \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-smclient=xsmp \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_with libsecret keyring) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		${myconf}
+}

diff --git a/app-text/evince/files/evince-0.7.1-display-menu.patch b/app-text/evince/files/evince-0.7.1-display-menu.patch
deleted file mode 100644
index 9edc43e..0000000
--- a/app-text/evince/files/evince-0.7.1-display-menu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -up -ruN evince-0.7.1.orig/data/evince.desktop.in.in evince-0.7.1/data/evince.desktop.in.in
---- evince-0.7.1.orig/data/evince.desktop.in.in	2007-01-10 11:04:20.000000000 -0500
-+++ evince-0.7.1/data/evince.desktop.in.in	2007-01-18 17:30:52.000000000 -0500
-@@ -9,7 +9,6 @@ StartupNotify=true
- Terminal=false
- Type=Application
- Icon=evince
--NoDisplay=true
- X-GNOME-DocPath=
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=evince


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: app-text/evince/files/, app-text/evince/
@ 2012-10-15  9:09 Alexandre Rostovtsev
  0 siblings, 0 replies; 5+ messages in thread
From: Alexandre Rostovtsev @ 2012-10-15  9:09 UTC (permalink / raw
  To: gentoo-commits

commit:     1332a45ec571a0f07a5929d8e59e06e94eebdf34
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 09:03:58 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 09:03:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1332a45e

app-text/evince: 3.5.92 → 3.6.0 + QA

Bump, remove useless USE=doc for non-live ebuilds, patch .desktop file
to avoid QA warning, update license.

---
 .../{evince-3.5.92.ebuild => evince-3.6.0.ebuild}  |   14 +++++++----
 app-text/evince/evince-9999.ebuild                 |   11 ++++----
 .../evince/files/evince-3.6.0-evince.desktop.patch |   26 ++++++++++++++++++++
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/app-text/evince/evince-3.5.92.ebuild b/app-text/evince/evince-3.6.0.ebuild
similarity index 90%
rename from app-text/evince/evince-3.5.92.ebuild
rename to app-text/evince/evince-3.6.0.ebuild
index f97cf85..8f3b28b 100644
--- a/app-text/evince/evince-3.5.92.ebuild
+++ b/app-text/evince/evince-3.6.0.ebuild
@@ -14,10 +14,11 @@ fi
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://www.gnome.org/projects/evince/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="dbus debug djvu doc dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
+IUSE="dbus debug djvu dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
 if [[ ${PV} = 9999 ]]; then
+	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
@@ -60,12 +61,12 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.13
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )"
+	virtual/pkgconfig"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
-		app-text/yelp-tools"
+		app-text/yelp-tools
+		doc? ( >=dev-util/gtk-doc-1.13 )"
 fi
 
 ELTCONF="--portage"
@@ -102,6 +103,9 @@ src_prepare() {
 	# Fix .desktop file so menu item shows up
 	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
 
+	# Fix .desktop file categories, in 3.7
+	epatch "${FILESDIR}/${P}-evince.desktop.patch"
+
 	gnome2_src_prepare
 	# Do not depend on gnome-icon-theme, bug #326855, #391859
 	sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \

diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-9999.ebuild
index f97cf85..3d44d21 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-9999.ebuild
@@ -14,10 +14,11 @@ fi
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://www.gnome.org/projects/evince/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="dbus debug djvu doc dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
+IUSE="dbus debug djvu dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
 if [[ ${PV} = 9999 ]]; then
+	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
@@ -60,12 +61,12 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.13
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )"
+	virtual/pkgconfig"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
-		app-text/yelp-tools"
+		app-text/yelp-tools
+		doc? ( >=dev-util/gtk-doc-1.13 )"
 fi
 
 ELTCONF="--portage"

diff --git a/app-text/evince/files/evince-3.6.0-evince.desktop.patch b/app-text/evince/files/evince-3.6.0-evince.desktop.patch
new file mode 100644
index 0000000..8fb7295
--- /dev/null
+++ b/app-text/evince/files/evince-3.6.0-evince.desktop.patch
@@ -0,0 +1,26 @@
+From a9f7ae46f2ea3d78cb53db4f0aad69bc7d0d163a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 12 Oct 2012 19:15:18 -0400
+Subject: [PATCH] evince.desktop: add 2DGraphics category
+
+Needed to pass validation with desktop-file-utils-0.20
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686062
+---
+ data/evince.desktop.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/evince.desktop.in.in b/data/evince.desktop.in.in
+index 7106d97..e38497e 100644
+--- a/data/evince.desktop.in.in
++++ b/data/evince.desktop.in.in
+@@ -13,5 +13,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=evince
+ X-GNOME-Bugzilla-Component=BugBuddyBugs
+ X-GNOME-Bugzilla-Version=@VERSION@
+-Categories=GNOME;GTK;Office;Viewer;Graphics;VectorGraphics;
++Categories=GNOME;GTK;Office;Viewer;Graphics;2DGraphics;VectorGraphics;
+ MimeType=@EVINCE_MIME_TYPES@
+-- 
+1.7.12.3
+


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-05-27 13:28 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-16 13:03 [gentoo-commits] proj/gnome:master commit in: app-text/evince/files/, app-text/evince/ Gilles Dartiguelongue
  -- strict thread matches above, loose matches on Subject: below --
2015-05-27 13:28 Alexandre Rostovtsev
2014-12-21 13:28 Gilles Dartiguelongue
2013-10-13 11:15 Gilles Dartiguelongue
2012-10-15  9:09 Alexandre Rostovtsev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox