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

Package-Manager: portage-2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r4 i686

5 files changed, 16 insertions, 102 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/Manifest b/games-simulation/secondlife-bin/Manifest
index b958fd8bb055..3670f4e23ea6 100644
--- a/games-simulation/secondlife-bin/Manifest
+++ b/games-simulation/secondlife-bin/Manifest
@@ -1,8 +1,6 @@
 DIST SecondLife-i686-1.21.6.99587.tar.bz2 37651707 RMD160 cf704a3501059da6b18ec09b8914ddb671ec9ace SHA1 ffbe865b5c9632f8ee75249be0150ec80c2ac1b6 SHA256 3c502401b673dada8ddb1412953a3984f17454913c552791153a175614d66509
-DIST SecondLife-i686-1.22.1.103637.tar.bz2 37622739 RMD160 62cdbd66cfb87b86178a815efe8c9e4a72e14085 SHA1 178241cff6bf0bb38d8c8f7476aa776e66e6cda7 SHA256 a121911bdedd178a2445694d8b6bf25ee6ffcbdb73e3f1b9aa745b29a2224fd8
 DIST SecondLife-i686-1.22.2.104576.tar.bz2 37680483 RMD160 c9f36595cbec478ff80177deafa5e37d2bebc525 SHA1 c9a2a1a762770f4c0b1bdba0931486bd8c86d054 SHA256 5db5d953726b9d679a8a9b6992e448c45ba783b7a08a02e95bf9a25f2a185488
-EBUILD secondlife-bin-1.21.6.ebuild 2516 RMD160 121fe2027e3585cfa90e6faef9d0fb5e326903bd SHA1 97fc01093d7682dfa2aabd8c54bb9eadd441eb19 SHA256 01fd377ab9e5b269fc90962f1685a33b3ffb9431d45f8d0b44b4f05826680c37
-EBUILD secondlife-bin-1.22_rc1.ebuild 2741 RMD160 45eb0bb4e1bd3ba019498f5a955dc93634482741 SHA1 6c23c3c495abe287c7978195c61ef351b1abc2a9 SHA256 fbe6fcf9282e612f9765d371cc31957d55dac3840126e4163badb7ea7992c380
-EBUILD secondlife-bin-1.22_rc2.ebuild 2741 RMD160 7b4d7b93f36cfcd593ecde75d5a4cdb98d97f109 SHA1 5acca92fb686e6b6dd684132eb38540faab02874 SHA256 fa950e93e51d5a3861d576d71f4642e8f312d03c8d659944309aa7cc5a6d3de3
-MISC ChangeLog 1356 RMD160 baaf8ec0dba09cd7238912bc5e221d482df272f1 SHA1 9e8447be267832ee46f615e566573a5bf57f3f94 SHA256 f4dc43b653cedc6ec76bb83260c6fa2d12f818a6925d6a6cf236b285c1bd4528
+EBUILD secondlife-bin-1.21.6.ebuild 2550 RMD160 fc7334bd2eb0fe706231178f0c1d45df46761981 SHA1 80d80ff186025e02b714e17071ef8201d0e0d10f SHA256 3fe4786ae694685d30ced291e7809c264761f8275873476999590a05e17eb9f8
+EBUILD secondlife-bin-1.22_rc2-r1.ebuild 2778 RMD160 6ec916e50c979643094c0712a563a7e168d3a450 SHA1 2aa71d069e7aa8969bae6e1d6e2b0d118f337f96 SHA256 655a37a6eef16f096193aac03dccfc5fc2a42e6c4f4e94ef27152c6a11b6db94
+MISC ChangeLog 1715 RMD160 5301b997a6a990cfafb3dc6a19be5db7456cd7fd SHA1 7aa220a77c88f17300585a11f0ac816ec9f76d1c SHA256 4b319191e576fbbcf0f7a67aae51c460fe14718161238ea240a1de609dc8c252
 MISC metadata.xml 310 RMD160 6387721976b5a6d1d20ea38eae46fe73a71b02f6 SHA1 f9b48d99a6501d5f3334885520749ccca91e0f1a SHA256 202d025172afc259b392b962d75fb5fab535a4810a7ef90dcb26b1de74f961e0
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