From 1a69dbec3620c148439ee836b4e6b294fa7cc50d Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 21 Jun 2010 15:21:40 +0000 Subject: [PATCH] Restrict media-libs/lcms depend to old version. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-gfx/inkscape/ChangeLog | 6 +++++- media-gfx/inkscape/inkscape-0.47.ebuild | 4 ++-- media-gfx/inkscape/inkscape-0.48_pre1.ebuild | 4 ++-- media-gfx/splashutils/ChangeLog | 6 +++++- media-gfx/splashutils/splashutils-1.5.4.3-r2.ebuild | 7 +++++-- media-gfx/xsane/ChangeLog | 7 +++++-- media-gfx/xsane/xsane-0.997.ebuild | 8 ++++---- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog index bfce9f23ae50..38e7752f6353 100644 --- a/media-gfx/inkscape/ChangeLog +++ b/media-gfx/inkscape/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/inkscape # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.141 2010/06/20 14:29:33 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.142 2010/06/21 15:14:55 ssuominen Exp $ + + 21 Jun 2010; Samuli Suominen inkscape-0.47.ebuild, + inkscape-0.48_pre1.ebuild: + Restrict media-libs/lcms depend to old version. *inkscape-0.48_pre1 (20 Jun 2010) diff --git a/media-gfx/inkscape/inkscape-0.47.ebuild b/media-gfx/inkscape/inkscape-0.47.ebuild index a3f97ea5ff19..29e84d539d53 100644 --- a/media-gfx/inkscape/inkscape-0.47.ebuild +++ b/media-gfx/inkscape/inkscape-0.47.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.47.ebuild,v 1.12 2010/04/16 10:44:23 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.47.ebuild,v 1.13 2010/06/21 15:14:55 ssuominen Exp $ EAPI=2 inherit eutils flag-o-matic gnome2 @@ -41,7 +41,7 @@ COMMON_DEPEND=" >=x11-libs/pango-1.4.0 || ( dev-lang/python[xml] dev-python/pyxml ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) - lcms? ( >=media-libs/lcms-1.14 ) + lcms? ( =media-libs/lcms-1* ) spell? ( app-text/aspell app-text/gtkspell diff --git a/media-gfx/inkscape/inkscape-0.48_pre1.ebuild b/media-gfx/inkscape/inkscape-0.48_pre1.ebuild index 0e38a95bc5a2..9b6a949857e9 100644 --- a/media-gfx/inkscape/inkscape-0.48_pre1.ebuild +++ b/media-gfx/inkscape/inkscape-0.48_pre1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48_pre1.ebuild,v 1.1 2010/06/20 14:29:33 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48_pre1.ebuild,v 1.2 2010/06/21 15:14:55 ssuominen Exp $ EAPI=2 inherit eutils flag-o-matic gnome2 @@ -41,7 +41,7 @@ COMMON_DEPEND=" >=x11-libs/pango-1.4.0 || ( dev-lang/python[xml] dev-python/pyxml ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) - lcms? ( >=media-libs/lcms-1.14 ) + lcms? ( =media-libs/lcms-1* ) spell? ( app-text/aspell app-text/gtkspell diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index 0930698c8b96..220142ab1daa 100644 --- a/media-gfx/splashutils/ChangeLog +++ b/media-gfx/splashutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/splashutils # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.173 2010/04/04 15:20:23 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.174 2010/06/21 15:17:37 ssuominen Exp $ + + 21 Jun 2010; Samuli Suominen + splashutils-1.5.4.3-r2.ebuild: + Restrict media-libs/lcms depend to old version. 04 Apr 2010; Michał Januszewski splashutils-1.5.4.3-r2.ebuild, diff --git a/media-gfx/splashutils/splashutils-1.5.4.3-r2.ebuild b/media-gfx/splashutils/splashutils-1.5.4.3-r2.ebuild index 990d35d9b6ce..ea573d918043 100644 --- a/media-gfx/splashutils/splashutils-1.5.4.3-r2.ebuild +++ b/media-gfx/splashutils/splashutils-1.5.4.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3-r2.ebuild,v 1.5 2010/04/04 15:20:23 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3-r2.ebuild,v 1.6 2010/06/21 15:17:37 ssuominen Exp $ EAPI="2" @@ -37,7 +37,10 @@ KEYWORDS="amd64 ppc x86" RDEPEND="gpm? ( sys-libs/gpm ) truetype? ( >=media-libs/freetype-2 ) png? ( >=media-libs/libpng-1.2.7 ) - mng? ( media-libs/lcms media-libs/libmng ) + mng? ( + =media-libs/lcms-1* + media-libs/libmng + ) >=media-libs/jpeg-6b:0 >=sys-apps/baselayout-1.9.4-r5 app-arch/cpio diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog index b35d10cd9c63..57036b13e4ee 100644 --- a/media-gfx/xsane/ChangeLog +++ b/media-gfx/xsane/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/xsane -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.82 2009/10/03 07:46:16 phosphan Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.83 2010/06/21 15:21:40 ssuominen Exp $ + + 21 Jun 2010; Samuli Suominen xsane-0.997.ebuild: + Restrict media-libs/lcms depend to old version. *xsane-0.997 (03 Oct 2009) diff --git a/media-gfx/xsane/xsane-0.997.ebuild b/media-gfx/xsane/xsane-0.997.ebuild index 77335079954b..695c77c8f4b2 100644 --- a/media-gfx/xsane/xsane-0.997.ebuild +++ b/media-gfx/xsane/xsane-0.997.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.997.ebuild,v 1.1 2009/10/03 07:46:16 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.997.ebuild,v 1.2 2010/06/21 15:21:40 ssuominen Exp $ inherit eutils @@ -15,11 +15,11 @@ IUSE="nls jpeg png tiff gimp lcms" RDEPEND="media-gfx/sane-backends >=x11-libs/gtk+-2.0 - jpeg? ( media-libs/jpeg ) + jpeg? ( >=media-libs/jpeg-8a ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) gimp? ( media-gfx/gimp ) - lcms? ( media-libs/lcms )" + lcms? ( =media-libs/lcms-1* )" DEPEND="${RDEPEND} dev-util/pkgconfig" -- 2.26.2