[gentoo-commits] proj/gnome:master commit in: media-gfx/gnome-font-viewer/

[Gilles Dartiguelongue]

commit:     f20700fadfa040df871d0aaccadf1beda326a2d0
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 23:08:20 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 16:17:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f20700fa

media-gfx/gnome-font-viewer: 3.8.0 → 3.10.0

---
 ...er-9999.ebuild => gnome-font-viewer-3.10.0.ebuild} | 19 ++++---------------
 .../gnome-font-viewer/gnome-font-viewer-9999.ebuild   | 10 +++-------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.10.0.ebuild
similarity index 60%
copy from media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild
copy to media-gfx/gnome-font-viewer/gnome-font-viewer-3.10.0.ebuild
index 9ae69f6..eda7085 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.10.0.ebuild
@@ -1,15 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Font viewer for GNOME 3"
 HOMEPAGE="https://live.gnome.org/GnomeUtils"
@@ -17,20 +13,14 @@ HOMEPAGE="https://live.gnome.org/GnomeUtils"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.31.0:2
+	>=dev-libs/glib-2.35.1:2
 	gnome-base/gnome-desktop:3=
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.0.3:3
-	x11-libs/pango
+	>=x11-libs/gtk+-3.9.11:3
 "
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gnome-control-center-2.91
@@ -39,6 +29,5 @@ RDEPEND="${COMMON_DEPEND}
 # ${PN} was part of gnome-utils before 3.4, and of g-c-c before 2.91
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "

diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild
index 9ae69f6..cac341a 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
@@ -24,13 +23,11 @@ else
 fi
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.31.0:2
+	>=dev-libs/glib-2.35.1:2
 	gnome-base/gnome-desktop:3=
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.0.3:3
-	x11-libs/pango
+	>=x11-libs/gtk+-3.9.11:3
 "
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gnome-control-center-2.91
@@ -39,6 +36,5 @@ RDEPEND="${COMMON_DEPEND}
 # ${PN} was part of gnome-utils before 3.4, and of g-c-c before 2.91
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "