From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-712079-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 0D5C31387FD
	for <garchives@archives.gentoo.org>; Fri, 18 Jul 2014 16:20:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E0ACBE09C9;
	Fri, 18 Jul 2014 16:20:11 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 5A4A7E09CB
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Jul 2014 16:20:11 +0000 (UTC)
Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 68CF03403E4
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Jul 2014 16:20:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by spoonbill.gentoo.org (Postfix) with ESMTP id 83F1B19403
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Jul 2014 16:20:05 +0000 (UTC)
From: "André Erdmann" <dywi@mailerd.de>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" <dywi@mailerd.de>
Message-ID: <1405697633.6bb55c0f9bb8925a50cb4e2f9aec302da6037500.dywi@gentoo>
Subject: [gentoo-commits] proj/R_overlay:master commit in: bin/build/
X-VCS-Repository: proj/R_overlay
X-VCS-Files: bin/build/setver.sh
X-VCS-Directories: bin/build/
X-VCS-Committer: dywi
X-VCS-Committer-Name: André Erdmann
X-VCS-Revision: 6bb55c0f9bb8925a50cb4e2f9aec302da6037500
X-VCS-Branch: master
Date: Fri, 18 Jul 2014 16:20:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: c66198b3-e318-47a3-a52e-adeda522a729
X-Archives-Hash: 93547bfc2ef34ebbfe498495eb6e40cd

commit:     6bb55c0f9bb8925a50cb4e2f9aec302da6037500
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul 18 15:33:53 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul 18 15:33:53 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=6bb55c0f

bin/build/setver.sh: change suffix handling

---
 bin/build/setver.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/bin/build/setver.sh b/bin/build/setver.sh
index ae8b048..bf5bf67 100755
--- a/bin/build/setver.sh
+++ b/bin/build/setver.sh
@@ -170,10 +170,11 @@ while [ ${#} -gt 0 ]; do
       --force-commit) want_forcecommit=true ;;
       --git-tag)      want_gittag=true      ;;
 
-      [Mmp]bump) ACTION="${1}" ;;
-      '+')       ACTION=pbump  ;;
-      '++')      ACTION=mbump  ;;
-      *.*.*)     ACTION=setver; V="${1}" ;;
+      [Mmp]bump)      ACTION="${1}" ;;
+      '+')            ACTION=pbump  ;;
+      '++')           ACTION=mbump  ;;
+      *.*.*)          ACTION=setver; V="${1}" ;;
+      *.*.*[-_]*)     ACTION=setver; V="${1}"; new_suffix= ;;
 
       setver)
          [ -n "${2-}" ] || die "one non-empty arg required after '${1}'."
@@ -218,18 +219,18 @@ autodie parse_version "${OLDVER}"
 case "${ACTION-}" in
    pbump)
       inc "${plvl}"
-      V="${major}.${minor}.${v0}${new_suffix}"
+      V="${major}.${minor}.${v0}"
    ;;
    mbump)
       inc "${minor}"
-      V="${major}.${v0}.0${new_suffix}"
+      V="${major}.${v0}.0"
    ;;
    Mbump)
       inc "${major}"
-      V="${v0}.0.0${new_suffix}"
+      V="${v0}.0.0"
    ;;
    setver)
-      true
+      V="${V}${new_suffix}"
    ;;
    *)
       ${want_reset} || die "unknown or no action specified."