[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/

[Mike Frysinger]

commit:     187ec2310c21c0c96812dec5e2d2a13172492ca9
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 16:49:18 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 16:50:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=187ec231

sys-kernel/genkernel: clean up automatic git version

Drop the leading "v" to match the version style we use in releases.

Always add a "-git" suffix so we know it's the 9999 ebuild even if the
git repo happens to be the same as the latest release.

 sys-kernel/genkernel/genkernel-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild 
b/sys-kernel/genkernel/genkernel-9999.ebuild
index f6cd4fc..2a5ada3 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -40,7 +40,7 @@ then
        SRC_URI="${COMMON_URI}"
 else
        inherit bash-completion-r1 eutils
-       SRC_URI="mirror://gentoo/${P}.tar.bz2
+       SRC_URI="mirror://gentoo/${P}.tar.xz
                ${COMMON_URI}"
        KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
 fi
@@ -87,7 +87,7 @@ src_unpack() {
 src_prepare() {
        if [[ ${PV} == 9999* ]] ; then
                einfo "Updating version tag"
-               GK_V=$(git describe --tags)
+               GK_V="$(git describe --tags | sed 's:^v::')-git"
                sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
                einfo "Producing ChangeLog from Git history..."
                pushd "${S}/.git" >/dev/null || die