public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: app-text/evince/
Date: Sun,  2 Sep 2012 18:59:56 +0000 (UTC)	[thread overview]
Message-ID: <1346611818.2625a90fbf5bf26078d478423be7d7a396bea60b.nirbheek@gentoo> (raw)

commit:     2625a90fbf5bf26078d478423be7d7a396bea60b
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  2 05:30:45 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> 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 <glib-2.32
-	rm -v cut-n-paste/gimpcellrenderertoggle/gimpwidgetsmarshal.{c,h} \
-		cut-n-paste/toolbar-editor/eggmarshalers.{c,h} \
-		libview/ev-view-marshal.{c,h} || die "rm failed"
-
 	# Fix .desktop file so menu item shows up
 	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
 

diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-9999.ebuild
index a52dc76..c34800e 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-9999.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 <glib-2.32
-	rm -v cut-n-paste/gimpcellrenderertoggle/gimpwidgetsmarshal.{c,h} \
-		cut-n-paste/toolbar-editor/eggmarshalers.{c,h} \
-		libview/ev-view-marshal.{c,h} || die "rm failed"
-
 	# Fix .desktop file so menu item shows up
 	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
 


             reply	other threads:[~2012-09-02 19:01 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-02 18:59 Nirbheek Chauhan [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-03-27 21:24 Ole Reifschneider
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-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=1346611818.2625a90fbf5bf26078d478423be7d7a396bea60b.nirbheek@gentoo \
    --to=nirbheek@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