Sat Apr 19 03:57:19 UTC 2014

2 files changed, 36 insertions, 57 deletions

diff --git a/core/efibootmgr/PKGBUILD b/core/efibootmgr/PKGBUILD
index d1552f30e..4b99ae7f8 100755
--- a/core/efibootmgr/PKGBUILD
+++ b/core/efibootmgr/PKGBUILD
@@ -1,43 +1,39 @@
-# $Id: PKGBUILD 206469 2014-02-27 10:35:34Z tpowa $
+# $Id: PKGBUILD 211195 2014-04-18 10:46:54Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Murtuza Akhtari <inxsible at gmail dot com>
 # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
-_pkgname="efibootmgr"
-pkgname="${_pkgname}"
-
-_gitroot="https://github.com/vathpela/efibootmgr.git"
-_gitname="${_pkgname}"
-_gitbranch="master"
-
-_GIT_COMMIT="f4e29e4200ed1e866c9cf98d2ebdcb8ac2e9826c"
-
-pkgver=0.6.1.29.gf4e29e4
-pkgrel=1
+pkgname="efibootmgr"
 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables"
+pkgver="0.7.0"
+pkgrel="1"
 arch=('x86_64' 'i686')
 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')
+options=('strip' 'zipman' 'docs' '!emptydirs')
 
-source=("${_gitname}::git+${_gitroot}#commit=${_GIT_COMMIT}")
+source=("efibootmgr::git+https://github.com/vathpela/efibootmgr.git#tag=efibootmgr-${pkgver}")
 sha1sums=('SKIP')
 
-pkgver() {
-	cd "${srcdir}/${_gitname}/"
-	echo "$(git describe --tags)" | sed -e 's|-|\.|g'
+_pkgver() {
+	cd "${srcdir}/efibootmgr/"
+	echo "$(git describe --tags)" | sed -e 's|efibootmgr-||g' -e 's|-|\.|g'
 }
 
-build() {
+prepare() {
+	
+	cd "${srcdir}/efibootmgr/"
 	
-	rm -rf "${srcdir}/${_gitname}_build/" || true
-	cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build"
+	git clean -x -d -f
+	echo
+	
+}
+
+build() {
 	
-	cd "${srcdir}/${_gitname}_build/"
+	cd "${srcdir}/efibootmgr/"
 	
 	make EXTRA_CFLAGS="-Os"
 	echo
@@ -46,12 +42,12 @@ build() {
 
 package() {
 	
-	cd "${srcdir}/${_gitname}_build/"
+	cd "${srcdir}/efibootmgr/"
 	
 	install -d "${pkgdir}/usr/bin/"
-	install -D -m0755 "${srcdir}/${_gitname}_build/src/efibootmgr/efibootmgr" "${pkgdir}/usr/bin/efibootmgr"
+	install -D -m0755 "${srcdir}/efibootmgr/src/efibootmgr/efibootmgr" "${pkgdir}/usr/bin/efibootmgr"
 	
 	install -d "${pkgdir}/usr/share/man/man8/"
-	install -D -m0644 "${srcdir}/${_gitname}_build/src/man/man8/efibootmgr.8" "${pkgdir}/usr/share/man/man8/efibootmgr.8"
+	install -D -m0644 "${srcdir}/efibootmgr/src/man/man8/efibootmgr.8" "${pkgdir}/usr/share/man/man8/efibootmgr.8"
 	
 }
diff --git a/core/efivar/PKGBUILD b/core/efivar/PKGBUILD
index 82913db7c..01ce62370 100644
--- a/core/efivar/PKGBUILD
+++ b/core/efivar/PKGBUILD
@@ -1,17 +1,11 @@
-# $Id: PKGBUILD 206468 2014-02-27 10:35:33Z tpowa $
+# $Id: PKGBUILD 211194 2014-04-18 10:46:53Z tpowa $
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 # Contributor : Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
-_pkgname="efivar"
-pkgname="${_pkgname}"
-
-_gitroot="https://github.com/vathpela/efivar.git"
-_gitname="${_pkgname}"
-_gitbranch="master"
-
-pkgdesc="Library to manipulate EFI variables"
-pkgver=0.7
-pkgrel=2
+pkgname="efivar"
+pkgdesc="Tools and library to manipulate EFI variables"
+pkgver="0.8"
+pkgrel="1"
 arch=('x86_64' 'i686')
 url="https://github.com/vathpela/efivar"
 license=('LGPL2.1')
@@ -19,41 +13,30 @@ makedepends=('git')
 depends=('popt')
 conflicts=('libefivar')
 provides=("libefivar=${pkgver}")
-options=('zipman' 'docs' '!makeflags')
+options=('strip' 'zipman' 'docs')
 
-source=("${_gitname}::git+${_gitroot}#tag=${pkgver}")
+source=("efivar::git+https://github.com/vathpela/efivar.git#tag=${pkgver}")
 sha1sums=('SKIP')
 
-pkgver() {
-	cd "${srcdir}/${_gitname}/"
+_pkgver() {
+	cd "${srcdir}/efivar/"
 	echo "$(git describe --tags)" | sed -e 's|-|\.|g'
 }
 
 prepare() {
 	
-	cd "${srcdir}/${_gitname}/"
+	cd "${srcdir}/efivar/"
 	
 	git clean -x -d -f
 	echo
 	
-	rm -rf "${srcdir}/${_gitname}_build/" || true
-	cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build"
-	
-	cd "${srcdir}/${_gitname}_build/"
-	
-	sed 's|-rpath=$(TOPDIR)/src/|-rpath=$(libdir)|g' -i "${srcdir}/${_gitname}_build/src/test/Makefile" || true
+	sed 's|-rpath=$(TOPDIR)/src/|-rpath=$(libdir)|g' -i "${srcdir}/efivar/src/test/Makefile" || true
 	
 }
 
 build() {
 	
-	cd "${srcdir}/${_gitname}_build/"
-	
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
+	cd "${srcdir}/efivar/"
 	
 	make libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" V=1 -j1
 	echo
@@ -62,12 +45,12 @@ build() {
 
 package() {
 	
-	cd "${srcdir}/${_gitname}_build/"
+	cd "${srcdir}/efivar/"
 	
 	make -j1 V=1 DESTDIR="${pkgdir}/" libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" install
 	echo
 	
 	install -d "${pkgdir}/usr/bin"
-	install -D -m0755 "${srcdir}/${_gitname}_build/src/test/tester" "${pkgdir}/usr/bin/efivar-tester"
+	install -D -m0755 "${srcdir}/efivar/src/test/tester" "${pkgdir}/usr/bin/efivar-tester"
 	
 }