From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 24 Mar 2010 07:03:51 +0000 (-0700)
Subject: Don't use $Id or $Rev for version strings since that doesn't work with git.
X-Git-Tag: v2.2_rc68~696
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f1b05b7098ba448a0987bc61224d6616dad3ecde;p=portage.git

Don't use $Id or $Rev for version strings since that doesn't work with git.
---

diff --git a/bin/etc-update b/bin/etc-update
index 03fef8d18..d18afa33a 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -487,7 +487,7 @@ while [[ -n $1 ]] ; do
 	case $1 in
 		-d|--debug)   SET_X=true;;
 		-h|--help)    usage;;
-		-V|--version) echo '$Id$'; exit 0;;
+		-V|--version) emerge --version ; exit 0;;
 		*)            usage 1 "Invalid option '$1'";;
 	esac
 	shift
diff --git a/bin/portageq b/bin/portageq
index 8d6c12e23..7f146aaf7 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -570,7 +570,7 @@ list_preserved_libs.uses_root = True
 
 def usage(argv):
 	print(">>> Portage information query tool")
-	print(">>> $Id$")
+	print(">>> %s" % portage.VERSION)
 	print(">>> Usage: portageq <command> [<option> ...]")
 	print("")
 	print("Available commands:")
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 685078728..6f5268ae9 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-VERSION="$Rev$"[6:-2] + "-svn"
+VERSION="HEAD"
 
 # ===========================================================================
 # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT