diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-04-26 13:10:57 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-04-26 13:10:57 +0000 |
| commit | 56f7489c584ff4b5353aa80ed586996b0b78b85d (patch) | |
| tree | dd330eed724b1e49fb6f4a1756e7f8abd5c517ea /virtual/jpeg | |
| parent | unmask zlib[minizip] now that autotools are keyworded (diff) | |
| download | gentoo-2-56f7489c584ff4b5353aa80ed586996b0b78b85d.tar.gz gentoo-2-56f7489c584ff4b5353aa80ed586996b0b78b85d.tar.bz2 gentoo-2-56f7489c584ff4b5353aa80ed586996b0b78b85d.zip | |
Force recent versions
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'virtual/jpeg')
| -rw-r--r-- | virtual/jpeg/ChangeLog | 4 | ||||
| -rw-r--r-- | virtual/jpeg/jpeg-0.ebuild | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/virtual/jpeg/ChangeLog b/virtual/jpeg/ChangeLog index cce82e942a16..b8699b8faec0 100644 --- a/virtual/jpeg/ChangeLog +++ b/virtual/jpeg/ChangeLog @@ -1,12 +1,12 @@ # ChangeLog for virtual/jpeg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/ChangeLog,v 1.6 2012/04/26 13:05:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/ChangeLog,v 1.7 2012/04/26 13:10:57 ssuominen Exp $ 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. + 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 diff --git a/virtual/jpeg/jpeg-0.ebuild b/virtual/jpeg/jpeg-0.ebuild index f8cd08c2d783..f3c057038e15 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.6 2012/04/26 13:05:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/jpeg-0.ebuild,v 1.7 2012/04/26 13:10:57 ssuominen Exp $ EAPI=4 @@ -13,6 +13,9 @@ 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="!prefix? ( media-libs/libjpeg-turbo:0[static-libs?] ) - prefix? ( || ( media-libs/libjpeg-turbo:0[static-libs?] media-libs/jpeg:0[static-libs?] ) )" +RDEPEND="!prefix? ( >=media-libs/libjpeg-turbo-1.2.0:0[static-libs?] ) + prefix? ( || ( + >=media-libs/libjpeg-turbo-1.2.0:0[static-libs?] + >=media-libs/jpeg-8d:0[static-libs?] + ) )" DEPEND="" |