From 2f1388fddeaebc9412d4c5d39d2c90cde187ff51 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Thu, 26 Apr 2012 13:05:01 +0000 Subject: Remove media-libs/jpeg:0 as a valid selection from everywhere (except prefix) wrt #413555. This is because libjpeg-turbo is only forward compatible and switching back to IJG's jpeg after system is built using libjpeg-turbo will break. Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64 --- virtual/jpeg/jpeg-0.ebuild | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'virtual/jpeg/jpeg-0.ebuild') diff --git a/virtual/jpeg/jpeg-0.ebuild b/virtual/jpeg/jpeg-0.ebuild index 020c403f462f..f8cd08c2d783 100644 --- a/virtual/jpeg/jpeg-0.ebuild +++ b/virtual/jpeg/jpeg-0.ebuild @@ -1,10 +1,10 @@ -# 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/virtual/jpeg/jpeg-0.ebuild,v 1.5 2011/04/27 18:03:05 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/jpeg-0.ebuild,v 1.6 2012/04/26 13:05:01 ssuominen Exp $ -EAPI=2 +EAPI=4 -DESCRIPTION="Virtual for jpeg library" +DESCRIPTION="A virtual for the JPEG implementation" HOMEPAGE="" SRC_URI="" @@ -13,5 +13,6 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" -RDEPEND="|| ( media-libs/libjpeg-turbo:0[static-libs?] media-libs/jpeg:0[static-libs?] )" +RDEPEND="!prefix? ( media-libs/libjpeg-turbo:0[static-libs?] ) + prefix? ( || ( media-libs/libjpeg-turbo:0[static-libs?] media-libs/jpeg:0[static-libs?] ) )" DEPEND="" -- cgit v1.2.3-65-gdbad