From: Samuli Suominen <ssuominen@gentoo.org>
Date: Wed, 10 Mar 2010 19:36:49 +0000 (+0000)
Subject: Fix jpeg depend wrt #308879.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d3729abbdf1705d38c7fe7dbb4ff5f959f56baa;p=gentoo.git

Fix jpeg depend wrt #308879.
Package-Manager: portage-2.2_rc66/cvs/Linux x86_64
---

diff --git a/games-strategy/savage2-bin/ChangeLog b/games-strategy/savage2-bin/ChangeLog
index 442417f7c85f..1f1cb931bc46 100644
--- a/games-strategy/savage2-bin/ChangeLog
+++ b/games-strategy/savage2-bin/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for games-strategy/savage2-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage2-bin/ChangeLog,v 1.4 2010/01/17 21:35:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage2-bin/ChangeLog,v 1.5 2010/03/10 19:36:49 ssuominen Exp $
 
-  17 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   savage2-bin-2.1.0.1-r1.ebuild:
-  Replace jpeg-compat with slotted <jpeg-7.
+  Fix jpeg depend wrt #308879.
 
 *savage2-bin-2.1.0.1-r1 (16 Sep 2009)
 
diff --git a/games-strategy/savage2-bin/Manifest b/games-strategy/savage2-bin/Manifest
index 9af1de42526b..b70bbd6176ae 100644
--- a/games-strategy/savage2-bin/Manifest
+++ b/games-strategy/savage2-bin/Manifest
@@ -1,5 +1,5 @@
 DIST Savage2Install-2.1.0.1-i686.bin 855983153 RMD160 816b1ac4db0b40fc2411e06bbfcb24cc1d9538a3 SHA1 b57dd95237a5b30e2ad2a14acf63b9c9bfe3c264 SHA256 e569ba82e9764e35a73164b515dbd9992cb65980cde1088143fbeb75a439cecf
 DIST Savage2Install-2.1.0.1-x86_64.bin 856277275 RMD160 a4ecb439601f2e86a7fca0393d3612f648df4deb SHA1 9ade8b736e58a86aba63bf66691b511b1a25cfc1 SHA256 e21fceff738d1bdcd9ea640c86a932f4ac84493bbafea3c199f7eaa721b46ea1
-EBUILD savage2-bin-2.1.0.1-r1.ebuild 2704 RMD160 b7b31aafc0408a61e629809b5b2478564bdcab97 SHA1 e80f20bda3e903b0015f5878f669a39def1f5480 SHA256 069bcc94eb6e2d91b626114aa05bd92bfb134262e4496368f25bc2f9f2c1ff2e
-MISC ChangeLog 935 RMD160 2c3a24834f3c29289b03f12f66113d7a3a2d28b6 SHA1 938f4fb87da6e6936d2855b629d2ff132a534c03 SHA256 04aaf3f4dbfcd7c0263d4a81f281a417d5c012ed00f1c675cb01da83f6351104
+EBUILD savage2-bin-2.1.0.1-r1.ebuild 2696 RMD160 9b17af35a717a883c54413e72fcb03280cd50b43 SHA1 b6fe837ac637c84ec4255f40f843476893acfe5d SHA256 7115851a62f98ae86f42d862ac7addbfbfec31099ad79707b0520db81a59379d
+MISC ChangeLog 922 RMD160 9122ae40778cf42d5e56f3595638c76e475b4d7d SHA1 6b363d24919de6baf80a612bb1c015f36a506c1d SHA256 af9e92badd3b10b45f48e4c8bf00ff6c7e043cd2328e145edae5fbc78035ccc9
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/savage2-bin/savage2-bin-2.1.0.1-r1.ebuild b/games-strategy/savage2-bin/savage2-bin-2.1.0.1-r1.ebuild
index 66f3022eac66..1233f5a37a1f 100644
--- a/games-strategy/savage2-bin/savage2-bin-2.1.0.1-r1.ebuild
+++ b/games-strategy/savage2-bin/savage2-bin-2.1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage2-bin/savage2-bin-2.1.0.1-r1.ebuild,v 1.3 2010/01/17 21:35:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage2-bin/savage2-bin-2.1.0.1-r1.ebuild,v 1.4 2010/03/10 19:36:49 ssuominen Exp $
 
 EAPI=2
 inherit eutils games
@@ -42,7 +42,7 @@ RDEPEND="virtual/opengl
 	media-libs/freetype:2
 	media-libs/fmod:1
 	sys-libs/glibc
-	x86? ( <media-libs/jpeg-7 )"
+	=media-libs/jpeg-6*"
 DEPEND="app-arch/unzip"
 
 S=${WORKDIR}/data