Change versioning to match upstream conventions

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

4 files changed, 21 insertions, 10 deletions

diff --git a/games-simulation/secondlife-bin/ChangeLog b/games-simulation/secondlife-bin/ChangeLog
index ad8f096a1e31..9da7178e29e5 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.2 2008/11/27 15:35:55 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/ChangeLog,v 1.3 2008/11/27 16:21:30 lavajoe Exp $
+
+*secondlife-bin-1.22_rc1 (27 Nov 2008)
+*secondlife-bin-1.21.6 (27 Nov 2008)
+
+  27 Nov 2008; Joe Peterson <lavajoe@gentoo.org>
+  +secondlife-bin-1.21.6.ebuild, -secondlife-bin-1.21.6.99587.ebuild,
+  +secondlife-bin-1.22_rc1.ebuild, -secondlife-bin-1.22.1_rc103637.ebuild:
+  Change versioning to match upstream conventions
 
 *secondlife-bin-1.22.1_rc103637 (27 Nov 2008)
 
diff --git a/games-simulation/secondlife-bin/Manifest b/games-simulation/secondlife-bin/Manifest
index 854555aab600..b26494086d1c 100644
--- a/games-simulation/secondlife-bin/Manifest
+++ b/games-simulation/secondlife-bin/Manifest
@@ -1,6 +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
-EBUILD secondlife-bin-1.21.6.99587.ebuild 2473 RMD160 02364483a97b5f910455134b986e6b15437c536b SHA1 3051a40117aa9c79ce431207a6a3c30b3f9e16c8 SHA256 330f4995186df9107febb0a14e31bfcb83f6dd93e7f94623ca5cf25ab2309522
-EBUILD secondlife-bin-1.22.1_rc103637.ebuild 2609 RMD160 ee6cf15b0c95c2cba4b5f9f072039690d17e37eb SHA1 40406d45e3a15ce0eb5fc50838f9743495c0d815 SHA256 5dc972bb451d3c68d5b11a4f1c56f819f8d8f5c4590772b8715edb9791418380
-MISC ChangeLog 799 RMD160 1f0202ae18b43e90547a985d8e4171264ebc474c SHA1 358bc22f89da79f4b7ca33ead1fa4b93f57a3f86 SHA256 63cb180f1eaac6773e437652386912bf92204d16afdd3d226f48862cd21b3a6c
+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
+MISC ChangeLog 1121 RMD160 08c5c898cef60246003bf926efab6a15ca479974 SHA1 dcf6a3d5bf9ac7cc948d4a7b75de193df4665d0a SHA256 63eb68e1b53e73052e104cc60d1f807817cdd1f68e46c64f6775e8b2fbc32fd8
 MISC metadata.xml 289 RMD160 76fca0dfc52fa8691df197d43fc27a697567f366 SHA1 84f04ebf4585cb4ccab8a6e9c99902de606f39bf SHA256 d7a9ef681e6b516ca3c4f4c6e0a605b7479f9790efacdd605c78fc30b9daca11
diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.21.6.99587.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.21.6.ebuild
index 4a9f7ee0d364..e30e2082b36e 100644
--- a/games-simulation/secondlife-bin/secondlife-bin-1.21.6.99587.ebuild
+++ b/games-simulation/secondlife-bin/secondlife-bin-1.21.6.ebuild
@@ -1,10 +1,11 @@
 # 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.99587.ebuild,v 1.1 2008/11/27 06:39:18 lavajoe Exp $
+# $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 $
 
 inherit eutils multilib games
 
-MY_P="SecondLife-i686-${PV}"
+SECONDLIFE_REVISION=99587
+MY_P="SecondLife-i686-${PV}.${SECONDLIFE_REVISION}"
 
 DESCRIPTION="The Second Life (an online, 3D virtual world) viewer"
 HOMEPAGE="http://secondlife.com/"
diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.22.1_rc103637.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.22_rc1.ebuild
index 1d6a2330b721..2226ef712991 100644
--- a/games-simulation/secondlife-bin/secondlife-bin-1.22.1_rc103637.ebuild
+++ b/games-simulation/secondlife-bin/secondlife-bin-1.22_rc1.ebuild
@@ -1,12 +1,14 @@
 # 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.1_rc103637.ebuild,v 1.1 2008/11/27 15:35:55 lavajoe Exp $
+# $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
 
-MAJOR_VER=$(get_version_component_range 1-3)
-MINOR_VER=$(get_version_component_range 4)
-MY_P="SecondLife-i686-${MAJOR_VER}.${MINOR_VER/rc/}"
+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/"