From 498f3c08a331f2e2a4a2cb58cb3f3320f24cefe8 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Fri, 28 Feb 2014 03:40:54 +0000
Subject: Fri Feb 28 03:37:40 UTC 2014

---
 core/efibootmgr/PKGBUILD | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'core/efibootmgr/PKGBUILD')

diff --git a/core/efibootmgr/PKGBUILD b/core/efibootmgr/PKGBUILD
index 2a6515a72..d1552f30e 100755
--- a/core/efibootmgr/PKGBUILD
+++ b/core/efibootmgr/PKGBUILD
@@ -1,15 +1,18 @@
-# $Id: PKGBUILD 197808 2013-10-30 11:03:08Z allan $
+# $Id: PKGBUILD 206469 2014-02-27 10:35:34Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Murtuza Akhtari <inxsible at gmail dot com>
-# Contributor: Keshav Padram Amburay <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
-pkgname="efibootmgr"
+_pkgname="efibootmgr"
+pkgname="${_pkgname}"
 
-_gitroot="git://github.com/vathpela/efibootmgr.git"
-_gitname="${pkgname}-pjones"
-_gitbranch="libefivars"
+_gitroot="https://github.com/vathpela/efibootmgr.git"
+_gitname="${_pkgname}"
+_gitbranch="master"
 
-pkgver=0.6.0.138.1132342
+_GIT_COMMIT="f4e29e4200ed1e866c9cf98d2ebdcb8ac2e9826c"
+
+pkgver=0.6.1.29.gf4e29e4
 pkgrel=1
 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables"
 arch=('x86_64' 'i686')
@@ -17,21 +20,16 @@ url="https://github.com/vathpela/efibootmgr"
 license=('GPL2')
 makedepends=('git')
 depends=('pciutils' 'efivar' 'zlib')
+conflicts=("${_pkgname}-pjones")
+provides=("${_pkgname}-pjones=${pkgver}")
 options=('strip' 'zipman' '!emptydirs')
 
-source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}")
+source=("${_gitname}::git+${_gitroot}#commit=${_GIT_COMMIT}")
 sha1sums=('SKIP')
 
 pkgver() {
 	cd "${srcdir}/${_gitname}/"
-	
-	_RELEASE_MAJOR="$(grep 'RELEASE_MAJOR' "${srcdir}/${_gitname}/Makefile" | head -1 | sed -e 's|RELEASE_MAJOR := ||g')"
-	_RELEASE_MINOR="$(grep 'RELEASE_MINOR' "${srcdir}/${_gitname}/Makefile" | head -1 | sed -e 's|RELEASE_MINOR := ||g')"
-	_RELEASE_SUBLEVEL="$(grep 'RELEASE_SUBLEVEL' "${srcdir}/${_gitname}/Makefile" | head -1 | sed -e 's|RELEASE_SUBLEVEL := ||g')"
-	
-	_ACTUAL_VER="$(echo ${_RELEASE_MAJOR}.${_RELEASE_MINOR}.${_RELEASE_SUBLEVEL} | sed 's| ||g')"
-	
-	echo "${_ACTUAL_VER}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+	echo "$(git describe --tags)" | sed -e 's|-|\.|g'
 }
 
 build() {
-- 
cgit v1.2.3-54-g00ecf