diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-21 14:41:53 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-21 14:41:53 +0000 |
commit | 0099d66cfc6af51432f18ae51e8b853a9624c7f6 (patch) | |
tree | a52dcac5b1c87f18278a549c55efcabb4dfd5aa1 /virtual/jpeg | |
parent | Improve HOMEPAGE for last commit (diff) | |
download | historical-0099d66cfc6af51432f18ae51e8b853a9624c7f6.tar.gz historical-0099d66cfc6af51432f18ae51e8b853a9624c7f6.tar.bz2 historical-0099d66cfc6af51432f18ae51e8b853a9624c7f6.zip |
Give up with bug 413555 and let people break their systems by switching back and forth with JPEGs
Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64
Diffstat (limited to 'virtual/jpeg')
-rw-r--r-- | virtual/jpeg/ChangeLog | 12 | ||||
-rw-r--r-- | virtual/jpeg/Manifest | 14 | ||||
-rw-r--r-- | virtual/jpeg/jpeg-0.ebuild | 7 |
3 files changed, 15 insertions, 18 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/Manifest b/virtual/jpeg/Manifest index 16906e0b969d..b4eaa5812870 100644 --- a/virtual/jpeg/Manifest +++ b/virtual/jpeg/Manifest @@ -1,13 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -EBUILD jpeg-0.ebuild 804 RMD160 80594a2f03d84e66e8f036fff2d48fd0917807ca SHA1 85dbebbede5c8055b4c5b39df72cceea6712eb7b SHA256 573060ab39e02c13014c24411c111a040cd8741519ffde879ac5266789d1c2a6 -MISC ChangeLog 1253 RMD160 f01dd2f4917968805ae76e01353df59a0a9378d3 SHA1 bcc03740e212ff92e508c3e738a04b7ef4231f22 SHA256 3d962992c9db10849c75535425fc8965666df6512c474802cacdb7a940992152 +EBUILD jpeg-0.ebuild 730 RMD160 ebb78b3b222dd170c1650bbdadf0329dfb0644a0 SHA1 566f4c5709664c9c750c59d070756e1fdc346b64 SHA256 4327b393ff6cfdd1b1b7e74f78ec415383c079033dd3fc5cddcbce9173fda903 +MISC ChangeLog 904 RMD160 397040fa575b88778d414ae5f6b62e9557dcde7b SHA1 feb4e8a816c3bbfc9db55ead305227834d44aa63 SHA256 696c176944e7cea88db857f68c1760afad7a02f74373675cc5339e683945ecb2 MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk+ZsksACgkQvFcC4BYPU0qbUQCgmOCagmO7Lcnz3LhruuM3AbIA -sHoAnjkP58I4RjkGkQPS894ysuwYX0Wv -=ljXW +iQEcBAEBAgAGBQJPulN+AAoJEEdUh39IaPFNBmoH/RHnQfd1PWGWHUYYmeiETAgf +b/ljTkmXF6U+Us739VwTdbF9d+nD6IBW3FOZs7MoIuQ/VEzY4ycSFP21rtADdFau ++ufSUdRfdBbkF4ORbGqymV7sYz/z30nXAys/NyNV5UAw4Kjr4y4olJxBe5Sd0NlL +iIiit0FCfR5esCkCqWPeyq/8vH+VcvP+bBYNRHlouw/fnF4FQU3dSUAYDgkVZ/Pk +J7PsV32LUSg1AemkJJ4RQA7ya4vZGqqLxPBvAmNjo3+AlZFe4PtohNDDaY9LwokV +pCVjPliwK9UP98Bm6AhcKwkpIPgvVswY0eCLPASQGXGb6dpP58mdCu7TR4DCcFY= +=emZ0 -----END PGP SIGNATURE----- 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="" |