summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-08-07 18:37:37 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-08-07 18:37:37 +0000
commitfec27950c513f780f1b9a99e6aca74ca6830ac1b (patch)
treeadaaa5a27fa964937d2b489d4486dd6643699b15 /virtual/jpeg
parentInsert missing MULTILIB_USEDEP to the virtual/udev dependency. (diff)
downloadgentoo-2-fec27950c513f780f1b9a99e6aca74ca6830ac1b.tar.gz
gentoo-2-fec27950c513f780f1b9a99e6aca74ca6830ac1b.tar.bz2
gentoo-2-fec27950c513f780f1b9a99e6aca74ca6830ac1b.zip
Pull in -r1 of media-libs/jpeg-9 wrt #479808 in attempt to force the upgrade.
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'virtual/jpeg')
-rw-r--r--virtual/jpeg/ChangeLog5
-rw-r--r--virtual/jpeg/jpeg-0-r2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/virtual/jpeg/ChangeLog b/virtual/jpeg/ChangeLog
index 5a4cf1e6e21c..d6f2264ed094 100644
--- a/virtual/jpeg/ChangeLog
+++ b/virtual/jpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for virtual/jpeg
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/ChangeLog,v 1.15 2013/08/02 08:30:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/ChangeLog,v 1.16 2013/08/07 18:37:37 ssuominen Exp $
+
+ 07 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> jpeg-0-r2.ebuild:
+ Pull in -r1 of media-libs/jpeg-9 wrt #479808 in attempt to force the upgrade.
02 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> jpeg-0-r2.ebuild,
jpeg-62.ebuild:
diff --git a/virtual/jpeg/jpeg-0-r2.ebuild b/virtual/jpeg/jpeg-0-r2.ebuild
index d9932f46de1f..f1633296132d 100644
--- a/virtual/jpeg/jpeg-0-r2.ebuild
+++ b/virtual/jpeg/jpeg-0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/jpeg-0-r2.ebuild,v 1.2 2013/08/02 08:30:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/jpeg-0-r2.ebuild,v 1.3 2013/08/07 18:37:37 ssuominen Exp $
EAPI=5
@@ -17,6 +17,6 @@ IUSE="static-libs"
RDEPEND="|| (
>=media-libs/libjpeg-turbo-1.3.0-r2:0[static-libs?,${MULTILIB_USEDEP}]
- >=media-libs/jpeg-9:0[static-libs?,${MULTILIB_USEDEP}]
+ >=media-libs/jpeg-9-r1:0[static-libs?,${MULTILIB_USEDEP}]
)"
DEPEND=""