summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-05-21 14:41:53 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-05-21 14:41:53 +0000
commit96b88fa9f26a3a3924a9d9e20ccfbcb16729b67f (patch)
treee90818c750cbd54ddd6c565267970de536b1509b /virtual/jpeg
parentImprove HOMEPAGE for last commit (diff)
downloadgentoo-2-96b88fa9f26a3a3924a9d9e20ccfbcb16729b67f.tar.gz
gentoo-2-96b88fa9f26a3a3924a9d9e20ccfbcb16729b67f.tar.bz2
gentoo-2-96b88fa9f26a3a3924a9d9e20ccfbcb16729b67f.zip
Give up with bug 413555 and let people break their systems by switching back and forth with JPEGs
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'virtual/jpeg')
-rw-r--r--virtual/jpeg/ChangeLog12
-rw-r--r--virtual/jpeg/jpeg-0.ebuild7
2 files changed, 6 insertions, 13 deletions
diff --git a/virtual/jpeg/ChangeLog b/virtual/jpeg/ChangeLog
index 37cea1692578..8cc8b3a536fd 100644
--- a/virtual/jpeg/ChangeLog
+++ b/virtual/jpeg/ChangeLog
@@ -1,24 +1,18 @@
# ChangeLog for virtual/jpeg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/ChangeLog,v 1.8 2012/04/26 20:38:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/ChangeLog,v 1.9 2012/05/21 14:41:53 ssuominen Exp $
26 Apr 2012; Alexis Ballier <aballier@gentoo.org> jpeg-0.ebuild:
keyword ~amd64-fbsd
- 26 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> jpeg-0.ebuild:
- 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. Force recent enough version(s) for chromium support wrt #393471.
-
27 Apr 2011; Fabian Groffen <grobian@gentoo.org> jpeg-0.ebuild:
Marked ~m68k-mint, bug #364787
26 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> jpeg-0.ebuild:
- USE="static-libs" wrt #356939 by Serkan Kaba.
+ USE="static-libs" for media-gfx/splashutils wrt #356939 by Serkan Kaba
01 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> jpeg-0.ebuild:
- Default to media-libs/libjpeg-turbo instead of media-libs/jpeg.
+ Default to media-libs/libjpeg-turbo:0 instead of media-libs/jpeg:0
07 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> jpeg-0.ebuild:
Set empty DEPEND wrt #344581 by Ulrich Müller.
diff --git a/virtual/jpeg/jpeg-0.ebuild b/virtual/jpeg/jpeg-0.ebuild
index 46197a6f38ab..976095d4a2af 100644
--- a/virtual/jpeg/jpeg-0.ebuild
+++ b/virtual/jpeg/jpeg-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/virtual/jpeg/jpeg-0.ebuild,v 1.8 2012/04/26 20:38:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/jpeg-0.ebuild,v 1.9 2012/05/21 14:41:53 ssuominen Exp $
EAPI=4
@@ -13,9 +13,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~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="!prefix? ( >=media-libs/libjpeg-turbo-1.2.0:0[static-libs?] )
- prefix? ( || (
+RDEPEND="|| (
>=media-libs/libjpeg-turbo-1.2.0:0[static-libs?]
>=media-libs/jpeg-8d:0[static-libs?]
- ) )"
+ )"
DEPEND=""