diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-01-09 16:17:00 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-09 16:17:00 +0000 |
| commit | 1bf5d08d46fc1c9301215e3c083751daf98dae2c (patch) | |
| tree | 8c69db00ddc380516df630e4a42655946ac08057 /media-gfx | |
| parent | x86 stable wrt bug #396359 (diff) | |
| download | gentoo-2-1bf5d08d46fc1c9301215e3c083751daf98dae2c.tar.gz gentoo-2-1bf5d08d46fc1c9301215e3c083751daf98dae2c.tar.bz2 gentoo-2-1bf5d08d46fc1c9301215e3c083751daf98dae2c.zip | |
Fix prev commit, something wrong happened there
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/gimageview/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/gimageview/gimageview-0.2.27-r2.ebuild | 10 | ||||
| -rw-r--r-- | media-gfx/gimageview/gimageview-0.2.27-r3.ebuild | 4 |
3 files changed, 8 insertions, 11 deletions
diff --git a/media-gfx/gimageview/ChangeLog b/media-gfx/gimageview/ChangeLog index c9d46233a06f..dd336371b91c 100644 --- a/media-gfx/gimageview/ChangeLog +++ b/media-gfx/gimageview/ChangeLog @@ -1,9 +1,6 @@ # ChangeLog for media-gfx/gimageview # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.28 2012/01/09 16:14:47 ssuominen Exp $ - - 09 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> Manifest: - Pull in version < 1.2.0 of xine-lib. +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.29 2012/01/09 16:17:00 ssuominen Exp $ 09 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> gimageview-0.2.27-r2.ebuild: diff --git a/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild index 8479f8ca4c69..ba26cc3cb6b7 100644 --- a/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild +++ b/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild,v 1.10 2012/01/09 16:12:57 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild,v 1.11 2012/01/09 16:17:00 ssuominen Exp $ EAPI=4 inherit eutils libtool @@ -12,16 +12,16 @@ SRC_URI="mirror://sourceforge/gtkmmviewer/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~hppa ppc ppc64 x86" -IUSE="nls wmf mng svg xine mplayer" +IUSE="mng nls mplayer svg xine wmf" RDEPEND="app-arch/bzip2 x11-libs/gtk+:2 - >=media-libs/libpng-1.4 + >=media-libs/libpng-1.2:0 x11-libs/libXinerama wmf? ( >=media-libs/libwmf-0.2.8 ) mng? ( media-libs/libmng ) svg? ( gnome-base/librsvg ) - xine? ( media-libs/xine-lib ) + xine? ( <media-libs/xine-lib-1.2.0 ) mplayer? ( media-video/mplayer )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) diff --git a/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild index 8ba55df25036..b074b392aba1 100644 --- a/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild +++ b/media-gfx/gimageview/gimageview-0.2.27-r3.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/gimageview/gimageview-0.2.27-r3.ebuild,v 1.1 2012/01/09 16:12:58 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild,v 1.2 2012/01/09 16:17:00 ssuominen Exp $ # TODO: USE xine could be restored if support for xine-lib-1.2.x # is patched in wrt #397639 @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/gtkmmviewer/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="nls wmf mng svg mplayer" #xine +IUSE="mng nls mplayer svg wmf" #xine RDEPEND="app-arch/bzip2 x11-libs/gtk+:2 |