Set VersionChannelName when running so new upstream releases do not break existing versions (bug #249894); remove old version

(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r4 i686)

4 files changed, 13 insertions, 97 deletions

diff --git a/games-simulation/secondlife-bin/ChangeLog b/games-simulation/secondlife-bin/ChangeLog
index dac9e9368f8c..7bf60fe4ce34 100644
--- a/games-simulation/secondlife-bin/ChangeLog
+++ b/games-simulation/secondlife-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-simulation/secondlife-bin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/ChangeLog,v 1.5 2008/12/04 13:55:52 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/ChangeLog,v 1.6 2008/12/07 07:21:16 lavajoe Exp $
+
+*secondlife-bin-1.22_rc2-r1 (07 Dec 2008)
+
+  07 Dec 2008; Joe Peterson <lavajoe@gentoo.org>
+  secondlife-bin-1.21.6.ebuild, -secondlife-bin-1.22_rc1.ebuild,
+  -secondlife-bin-1.22_rc2.ebuild, +secondlife-bin-1.22_rc2-r1.ebuild:
+  Set VersionChannelName when running so new upstream releases do not break
+  existing versions (bug #249894); remove old version
 
 *secondlife-bin-1.22_rc2 (04 Dec 2008)
 
diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.21.6.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.21.6.ebuild
index e30e2082b36e..eafca2a817fd 100644
--- a/games-simulation/secondlife-bin/secondlife-bin-1.21.6.ebuild
+++ b/games-simulation/secondlife-bin/secondlife-bin-1.21.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.21.6.ebuild,v 1.1 2008/11/27 16:21:30 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/secondlife-bin-1.21.6.ebuild,v 1.2 2008/12/07 07:21:16 lavajoe Exp $
 
 inherit eutils multilib games
 
@@ -82,7 +82,7 @@ src_install() {
 
 	dosym /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf "${SECONDLIFE_HOME}"/unicode.ttf
 
-	games_make_wrapper secondlife-bin ./secondlife "${SECONDLIFE_HOME}" "${SECONDLIFE_HOME}"/lib
+	games_make_wrapper secondlife-bin "./secondlife --set VersionChannelName Gentoo" "${SECONDLIFE_HOME}" "${SECONDLIFE_HOME}"/lib
 	make_desktop_entry secondlife-bin "Second Life" /opt/secondlife/secondlife_icon.png
 
 	prepgamesdirs
diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.22_rc1.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.22_rc1.ebuild
deleted file mode 100644
index 2226ef712991..000000000000
--- a/games-simulation/secondlife-bin/secondlife-bin-1.22_rc1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2008 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.22_rc1.ebuild,v 1.1 2008/11/27 16:21:30 lavajoe Exp $
-
-inherit eutils multilib games versionator
-
-SECONDLIFE_REVISION=103637
-SECONDLIFE_MAJOR_VER=$(get_version_component_range 1-2)
-SECONDLIFE_MINOR_VER=$(get_version_component_range 3)
-SECONDLIFE_MINOR_VER=${SECONDLIFE_MINOR_VER/rc/}
-MY_P="SecondLife-i686-${SECONDLIFE_MAJOR_VER}.${SECONDLIFE_MINOR_VER}.${SECONDLIFE_REVISION}"
-
-DESCRIPTION="The Second Life (an online, 3D virtual world) viewer"
-HOMEPAGE="http://secondlife.com/"
-SRC_URI="http://release-candidate-secondlife-com.s3.amazonaws.com/${MY_P}.tar.bz2"
-RESTRICT="mirror strip"
-
-LICENSE="GPL-2-with-Linden-Lab-FLOSS-exception"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="sys-libs/glibc
-	media-fonts/kochi-substitute
-	x86? (
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		dev-libs/libgcrypt
-		dev-libs/libgpg-error
-		dev-libs/openssl
-		media-libs/freetype
-		media-libs/libogg
-		media-libs/libsdl
-		media-libs/libvorbis
-		net-libs/gnutls
-		net-misc/curl
-		sys-libs/zlib
-		virtual/glu
-		virtual/opengl
-	)
-	amd64? (
-		app-emulation/emul-linux-x86-sdl
-		app-emulation/emul-linux-x86-gtklibs
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-SECONDLIFE_HOME="${GAMES_PREFIX_OPT}/secondlife"
-
-QA_TEXTRELS="${SECONDLIFE_HOME:1}/bin/libllkdu.so
-	${SECONDLIFE_HOME:1}/lib/libkdu_v42R.so
-	${SECONDLIFE_HOME:1}/lib/libfmod-3.75.so
-	${SECONDLIFE_HOME:1}/lib/libvivoxsdk.so
-	${SECONDLIFE_HOME:1}/app_settings/mozilla-runtime-linux-i686/libxul.so"
-QA_EXECSTACK="${SECONDLIFE_HOME:1}/bin/do-not-directly-run-secondlife-bin
-	${SECONDLIFE_HOME:1}/bin/libllkdu.so
-	${SECONDLIFE_HOME:1}/lib/libSDL-1.2.so.0
-	${SECONDLIFE_HOME:1}/lib/libcrypto.so.0.9.7
-	${SECONDLIFE_HOME:1}/lib/libkdu_v42R.so
-	${SECONDLIFE_HOME:1}/lib/libfmod-3.75.so
-	${SECONDLIFE_HOME:1}/app_settings/mozilla-runtime-linux-i686/libxul.so"
-
-pkg_setup() {
-	# x86 binary package, ABI=x86
-	has_multilib_profile && ABI="x86"
-}
-
-src_install() {
-	exeinto "${SECONDLIFE_HOME}"
-	doexe launch_url.sh linux-crash-logger.bin secondlife || die
-	rm -rf launch_url.sh linux-crash-logger.bin secondlife
-
-	exeinto "${SECONDLIFE_HOME}"/bin
-	doexe bin/* || die
-	rm -rf bin
-
-	exeinto "${SECONDLIFE_HOME}"/lib
-	doexe lib/* || die
-	rm -rf lib
-
-	insinto "${SECONDLIFE_HOME}"
-	doins -r * || die "doins * failed"
-
-	dosym /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf "${SECONDLIFE_HOME}"/unicode.ttf
-
-	games_make_wrapper secondlife-bin ./secondlife "${SECONDLIFE_HOME}" "${SECONDLIFE_HOME}"/lib
-	make_desktop_entry secondlife-bin "Second Life" /opt/secondlife/secondlife_icon.png
-
-	prepgamesdirs
-}
diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.22_rc2.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.22_rc2-r1.ebuild
index 0cdcc65e1c77..15551e265b79 100644
--- a/games-simulation/secondlife-bin/secondlife-bin-1.22_rc2.ebuild
+++ b/games-simulation/secondlife-bin/secondlife-bin-1.22_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.22_rc2.ebuild,v 1.1 2008/12/04 13:55:52 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/secondlife-bin-1.22_rc2-r1.ebuild,v 1.1 2008/12/07 07:21:16 lavajoe Exp $
 
 inherit eutils multilib games versionator
 
@@ -85,7 +85,7 @@ src_install() {
 
 	dosym /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf "${SECONDLIFE_HOME}"/unicode.ttf
 
-	games_make_wrapper secondlife-bin ./secondlife "${SECONDLIFE_HOME}" "${SECONDLIFE_HOME}"/lib
+	games_make_wrapper secondlife-bin "./secondlife --set VersionChannelName Gentoo" "${SECONDLIFE_HOME}" "${SECONDLIFE_HOME}"/lib
 	make_desktop_entry secondlife-bin "Second Life" /opt/secondlife/secondlife_icon.png
 
 	prepgamesdirs