[gentoo-commits] proj/gnome:master commit in: app-text/evince/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     28982da90df7f4bd0a33b4c6d4fca7924b5d86e8
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  7 21:22:56 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Apr  7 21:22:56 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=28982da9

app-text/evince: 3.10.3 → 3.12.0

---
 .../{evince-9999.ebuild => evince-3.12.0.ebuild}   | 27 +++-------------------
 app-text/evince/evince-9999.ebuild                 |  5 +---
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-3.12.0.ebuild
similarity index 81%
copy from app-text/evince/evince-9999.ebuild
copy to app-text/evince/evince-3.12.0.ebuild
index a4131d0..8efba56 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-3.12.0.ebuild
@@ -7,9 +7,6 @@ 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/"
@@ -18,12 +15,7 @@ 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 +introspection libsecret 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
+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
@@ -37,9 +29,6 @@ COMMON_DEPEND="
 	sys-libs/zlib:=
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.8:3[introspection?]
-	x11-libs/libX11:=
-	>=x11-libs/libSM-1:=
-	x11-libs/libICE:=
 	gnome-base/gsettings-desktop-schemas
 	>=x11-libs/cairo-1.10:=
 	>=app-text/poppler-0.24:=[cairo]
@@ -51,7 +40,7 @@ COMMON_DEPEND="
 	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:= )
+	postscript? ( >=app-text/libspectre-0.2:= )
 	tiff? ( >=media-libs/tiff-3.6:0= )
 	xps? ( >=app-text/libgxps-0.2.1:= )
 "
@@ -71,14 +60,6 @@ DEPEND="${COMMON_DEPEND}
 	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"
@@ -95,8 +76,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=""
-	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
 	gnome2_src_configure \
 		--disable-static \
 		--disable-tests \
@@ -115,5 +94,5 @@ src_configure() {
 		$(use_enable t1lib) \
 		$(use_enable tiff) \
 		$(use_enable xps) \
-		${myconf}
+		ITSTOOL=$(type -P true)
 }

diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-9999.ebuild
index a4131d0..db49247 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-9999.ebuild
@@ -37,9 +37,6 @@ COMMON_DEPEND="
 	sys-libs/zlib:=
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.8:3[introspection?]
-	x11-libs/libX11:=
-	>=x11-libs/libSM-1:=
-	x11-libs/libICE:=
 	gnome-base/gsettings-desktop-schemas
 	>=x11-libs/cairo-1.10:=
 	>=app-text/poppler-0.24:=[cairo]
@@ -51,7 +48,7 @@ COMMON_DEPEND="
 	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:= )
+	postscript? ( >=app-text/libspectre-0.2:= )
 	tiff? ( >=media-libs/tiff-3.6:0= )
 	xps? ( >=app-text/libgxps-0.2.1:= )
 "