summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-03-01 17:36:08 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-03-01 17:36:08 +0000
commit291dda931dac62df66137bbbc4a3e95eda80e676 (patch)
tree75d63db16e641eaa65f2e5ce69ab22c378b990c0 /virtual/jpeg
parentRun "make test" instead of "make check" by Johan Bergström. (diff)
downloadhistorical-291dda931dac62df66137bbbc4a3e95eda80e676.tar.gz
historical-291dda931dac62df66137bbbc4a3e95eda80e676.tar.bz2
historical-291dda931dac62df66137bbbc4a3e95eda80e676.zip
Default to media-libs/libjpeg-turbo instead of media-libs/jpeg.
Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64
Diffstat (limited to 'virtual/jpeg')
-rw-r--r--virtual/jpeg/ChangeLog7
-rw-r--r--virtual/jpeg/Manifest4
-rw-r--r--virtual/jpeg/jpeg-0.ebuild6
3 files changed, 10 insertions, 7 deletions
diff --git a/virtual/jpeg/ChangeLog b/virtual/jpeg/ChangeLog
index 3caa8be44259..f5092df031ea 100644
--- a/virtual/jpeg/ChangeLog
+++ b/virtual/jpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for virtual/jpeg
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/ChangeLog,v 1.2 2010/11/07 20:38:31 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/ChangeLog,v 1.3 2011/03/01 17:36:08 ssuominen Exp $
+
+ 01 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> jpeg-0.ebuild:
+ Default to media-libs/libjpeg-turbo instead of media-libs/jpeg.
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 95960ec837d4..36b17b414d76 100644
--- a/virtual/jpeg/Manifest
+++ b/virtual/jpeg/Manifest
@@ -1,3 +1,3 @@
-EBUILD jpeg-0.ebuild 636 RMD160 d2a632ea0278992930ab8f47a21e8a7bfd258b61 SHA1 40f7f5ffa1f49207fca9fa3a9d07da5e594688f3 SHA256 3094f1bed2cc45b5c27ab3bf6fc60b419512c6c003291460d6d69be62bf5e5f1
-MISC ChangeLog 432 RMD160 40988390871469ced9748e27524e3a2fa63ee549 SHA1 90da9308473afed27f7c1fbcb4f7f506374dc7d5 SHA256 af83c244708c2858d5131647de5590fe43fb7281738143f2d730c8fececa7cf0
+EBUILD jpeg-0.ebuild 636 RMD160 0c3b68a85d19583e69d43061a559f6708bf379f9 SHA1 8318ec130dbd9c7a255d7d4af7627719b1ae5118 SHA256 dd47f1c2b47093e668780f2af0646ea58080aa6b9247d4f58a09f8db4ca0a6a7
+MISC ChangeLog 568 RMD160 d3a89b22421d1959d417d1b9008ff51049aad910 SHA1 0c2cea2ec5b4dadee3cc2766d747988900bde5a9 SHA256 d45abc8b76fa9e80a6ac2e2f1d50b78bf85eae2ebb0d8797ce5b539febb06a00
MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564
diff --git a/virtual/jpeg/jpeg-0.ebuild b/virtual/jpeg/jpeg-0.ebuild
index 12d6457f3a17..15a7718ba494 100644
--- a/virtual/jpeg/jpeg-0.ebuild
+++ b/virtual/jpeg/jpeg-0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2 2010/11/07 20:38:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/jpeg-0.ebuild,v 1.3 2011/03/01 17:36:08 ssuominen Exp $
EAPI=2
@@ -13,5 +13,5 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="|| ( media-libs/jpeg:0 media-libs/libjpeg-turbo:0 )"
+RDEPEND="|| ( media-libs/libjpeg-turbo:0 media-libs/jpeg:0 )"
DEPEND=""