From 8c8ff438ec1a70ebf20e47c530b146f3817f0a97 Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Sun, 17 Jan 2010 21:37:16 +0000
Subject: Replace jpeg-compat with slotted <jpeg-7. Package-Manager:
 portage-2.2_rc61/cvs/Linux x86_64

---
 games-simulation/secondlife-bin/ChangeLog                      | 8 ++++++--
 games-simulation/secondlife-bin/Manifest                       | 6 +++---
 games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild   | 6 +++---
 games-simulation/secondlife-bin/secondlife-bin-1.23_rc4.ebuild | 6 +++---
 4 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'games-simulation')

diff --git a/games-simulation/secondlife-bin/ChangeLog b/games-simulation/secondlife-bin/ChangeLog
index da6db9bdbdf1..a0b55d95c061 100644
--- a/games-simulation/secondlife-bin/ChangeLog
+++ b/games-simulation/secondlife-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/secondlife-bin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/ChangeLog,v 1.27 2009/12/06 19:59:26 lavajoe Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/ChangeLog,v 1.28 2010/01/17 21:37:16 ssuominen Exp $
+
+  17 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  secondlife-bin-1.23_rc4.ebuild, secondlife-bin-1.23.5.ebuild:
+  Replace jpeg-compat with slotted <jpeg-7.
 
 *secondlife-bin-1.23.5 (06 Dec 2009)
 
diff --git a/games-simulation/secondlife-bin/Manifest b/games-simulation/secondlife-bin/Manifest
index a3eb813db63a..2880c0e8761a 100644
--- a/games-simulation/secondlife-bin/Manifest
+++ b/games-simulation/secondlife-bin/Manifest
@@ -2,7 +2,7 @@ AUX secondlife-bin-1.23.5-amd64-audio-streaming-fix.patch 1118 RMD160 d9511a049a
 AUX secondlife-bin-1.23_rc4-amd64-audio-streaming-fix.patch 1118 RMD160 d9511a049a7a58ceca82453c435c78ec592197b1 SHA1 ac2d593c36c2869e30764e09d519ae3d38fdf9e6 SHA256 8595595ce3690501adab819a7652b789ca6dbf088b5c42d9be4ae83020c22b2b
 DIST SecondLife-i686-1.23.4.123523.tar.bz2 42675704 RMD160 e9913b2cc353a315894c4eddfb39219c3df84508 SHA1 f20f2c60c6e88e9d5e67c9f4d9f66117d656aae3 SHA256 1a33ee51e917662c408fb723c2171e896d54f17e738fe96fd4c7540cddfb9151
 DIST SecondLife-i686-1.23.5.136262.tar.bz2 42674963 RMD160 92a7a63e94feaafeae8b58e38d13386ff6307031 SHA1 58a681850eb1def22e1ace2ab9e826a47bdfb20e SHA256 012396798902f7b92a0e13a34616dd38cf5571ccacb1dad0055033b9c62024e0
-EBUILD secondlife-bin-1.23.5.ebuild 3227 RMD160 87a8bc93bb8610eb88529900b781359735ad4122 SHA1 2b80c4761aeaaf187f01dd6eb0d8f6e95eed7307 SHA256 33c2fa397f789114b933f1b0b3409e8b5cd1daa30f2b6d6c1b4fe709956d73a4
-EBUILD secondlife-bin-1.23_rc4.ebuild 3432 RMD160 2bb2de72ac1b371f8b915e405a5e4f2ebdc3c823 SHA1 2dcfd9375489e3b21c5074c695d5d73f7dfaf545 SHA256 5e0820cd7623f4b2f186db2d8dffc9cf3eac77261aec6b0fb023c7879e4eff73
-MISC ChangeLog 6004 RMD160 2b262fbf3fbd4dde8df327f5da1a44f3b3a8c4cc SHA1 87ad82ba95d2261e6251c58debd7e7f1c1a52982 SHA256 fd30d5493c035d4f24c78645a24c46a15b36dfaf98638ae96799a0e9ab8aff2a
+EBUILD secondlife-bin-1.23.5.ebuild 3199 RMD160 67050eb57601b3f01022253813e5f0a7bd3964f0 SHA1 07e9c5f0fb7379ddd368ad7ff687ed0b40af18f5 SHA256 a5ad202fb56a7cc0538e6be85e76ce5ad86d3d55500045e95e28e5a75a638d1f
+EBUILD secondlife-bin-1.23_rc4.ebuild 3402 RMD160 3597b6575ae73600b5d73bd7e6fe868c66bdf4f3 SHA1 fb523d213bcaa3bcf093c8fd9b0f6ae4855b00e1 SHA256 aca81939d8282404465c95a640854275a12761a9cc3128af9c1a6354889cff9c
+MISC ChangeLog 6169 RMD160 98bd31aeafb37d4e8e680262b29dcf6c1f395e1b SHA1 e5bf8cc6e1ee18f9271652d0c24bfb876c2c82fc SHA256 6860b62cba76ff401f360dc500e3eeb4067d64271e5065fcba4a5a8525635e99
 MISC metadata.xml 310 RMD160 6387721976b5a6d1d20ea38eae46fe73a71b02f6 SHA1 f9b48d99a6501d5f3334885520749ccca91e0f1a SHA256 202d025172afc259b392b962d75fb5fab535a4810a7ef90dcb26b1de74f961e0
diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild
index cab3c1dbec2a..500afc4f729e 100644
--- a/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild
+++ b/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild,v 1.1 2009/12/06 19:59:26 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild,v 1.2 2010/01/17 21:37:16 ssuominen Exp $
 
 inherit eutils multilib games versionator
 
@@ -42,7 +42,7 @@ RDEPEND="sys-libs/glibc
 	media-libs/gstreamer
 	media-plugins/gst-plugins-meta
 	media-libs/fmod
-	x86? ( || ( media-libs/jpeg-compat <media-libs/jpeg-7 ) )
+	x86? ( <media-libs/jpeg-7 )
 	media-libs/openjpeg
 	net-libs/gnutls
 	net-misc/curl
diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.23_rc4.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.23_rc4.ebuild
index 483cae138b41..83afa8134276 100644
--- a/games-simulation/secondlife-bin/secondlife-bin-1.23_rc4.ebuild
+++ b/games-simulation/secondlife-bin/secondlife-bin-1.23_rc4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/secondlife-bin-1.23_rc4.ebuild,v 1.5 2009/09/13 13:10:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/secondlife-bin-1.23_rc4.ebuild,v 1.6 2010/01/17 21:37:16 ssuominen Exp $
 
 inherit eutils multilib games versionator
 
@@ -45,7 +45,7 @@ RDEPEND="sys-libs/glibc
 	media-libs/gstreamer
 	media-plugins/gst-plugins-meta
 	media-libs/fmod
-	x86? ( || ( media-libs/jpeg-compat <media-libs/jpeg-7 ) )
+	x86? ( <media-libs/jpeg-7 )
 	media-libs/openjpeg
 	net-libs/gnutls
 	net-misc/curl
-- 
cgit v1.2.3-65-gdbad