diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-10-22 18:03:27 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-10-22 18:03:27 +0000 |
| commit | e280e7b238673b5a13e83d1e3e7e5a739057db15 (patch) | |
| tree | c9edb1fcf520093389fb14ce4be1490c7cf00ce3 /media-gfx | |
| parent | Punt obsolete imagemagick mask. (diff) | |
| download | gentoo-2-e280e7b238673b5a13e83d1e3e7e5a739057db15.tar.gz gentoo-2-e280e7b238673b5a13e83d1e3e7e5a739057db15.tar.bz2 gentoo-2-e280e7b238673b5a13e83d1e3e7e5a739057db15.zip | |
Block on gnome-control-center-2 due to file collision (bug #438014, thanks to fryvil). Update license.
(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/gnome-font-viewer/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/gnome-font-viewer/gnome-font-viewer-3.4.0.ebuild | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/media-gfx/gnome-font-viewer/ChangeLog b/media-gfx/gnome-font-viewer/ChangeLog index 2d23a747a32e..6b2d2cfbc199 100644 --- a/media-gfx/gnome-font-viewer/ChangeLog +++ b/media-gfx/gnome-font-viewer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/gnome-font-viewer # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-font-viewer/ChangeLog,v 1.1 2012/05/05 07:56:21 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-font-viewer/ChangeLog,v 1.2 2012/10/22 18:03:27 tetromino Exp $ + + 22 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + gnome-font-viewer-3.4.0.ebuild: + Block on gnome-control-center-2 due to file collision (bug #438014, thanks to + fryvil). Update license. *gnome-font-viewer-3.4.0 (05 May 2012) diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.4.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.4.0.ebuild index ae97f0622ce2..e83bff3db6ee 100644 --- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.4.0.ebuild +++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-font-viewer/gnome-font-viewer-3.4.0.ebuild,v 1.1 2012/05/05 07:56:21 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-font-viewer/gnome-font-viewer-3.4.0.ebuild,v 1.2 2012/10/22 18:03:27 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -11,7 +11,7 @@ inherit gnome2 DESCRIPTION="Font viewer for GNOME 3" HOMEPAGE="https://live.gnome.org/GnomeUtils" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" IUSE="" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" @@ -22,8 +22,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.0:2 >=x11-libs/gtk+-3.0.3:3 x11-libs/pango" RDEPEND="${COMMON_DEPEND} + !<gnome-base/gnome-control-center-2.91 !<gnome-extra/gnome-utils-3.4" -# ${PN} was part of gnome-utils before 3.4 +# ${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 |