From bc08e4d17350157082b0fa1ff3ffff14fc14d3be Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Fri, 23 Oct 2020 12:52:01 -0400
Subject: [linux-libre-api-headers]: rename convenience vars

---
 libre/linux-libre-api-headers/PKGBUILD | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'libre/linux-libre-api-headers')

diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index 3954de6fb..78294bece 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -11,18 +11,18 @@
 
 pkgname=linux-libre-api-headers
 pkgver=5.8.13_gnu
-_basever=${pkgver%.*_gnu}
+_minor_ver=${pkgver%.*}
+_upstream_ver=${pkgver//_/-}
+_dep_ver=${pkgver%_*}
 pkgrel=1
 pkgdesc='Kernel headers sanitized for use in userspace'
 arch=(x86_64 i686 armv7h)
 url='https://www.gnu.org/software/libc'
 license=(GPL2)
 makedepends=(rsync)
-provides=("linux-api-headers=${pkgver%_*}")
-conflicts=('linux-api-headers')
-replaces=('linux-api-headers')
-source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}-gnu/linux-libre-${_basever}-gnu.tar.xz{,.sign}
-        https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver//_/-}/patch-${_basever}-gnu-${pkgver//_/-}.xz{,.sign})
+provides=("linux-api-headers=${_dep_ver}")
+source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_minor_ver}-gnu/linux-libre-${_minor_ver}-gnu.tar.xz{,.sign}
+        https://linux-libre.fsfla.org/pub/linux-libre/releases/${_upstream_ver}/patch-${_minor_ver}-gnu-${_upstream_ver}.xz{,.sign})
 sha256sums=('8146325466ee53cf46f993ba3d17296272f48bc9f13dd29b89e68563fd805980'
             'SKIP'
             '495123509db6c27b89cac3a38ad69d938404eb13ccf34c54e6ec677946b2e4cd'
@@ -30,19 +30,19 @@ sha256sums=('8146325466ee53cf46f993ba3d17296272f48bc9f13dd29b89e68563fd805980'
 validpgpkeys=('474402C8C582DAFBE389C427BCB7CF877E7D47A7') # Alexandre Oliva
 
 prepare() {
-  cd linux-${pkgver%.*}
-  patch -p1 -i "$srcdir/patch-${_basever}-gnu-${pkgver//_/-}"
+  cd linux-${_minor_ver}
+  patch -p1 -i "$srcdir/patch-${_minor_ver}-gnu-${_upstream_ver}"
 }
 
 build() {
-  cd linux-${pkgver%.*}
+  cd linux-${_minor_ver}
 
   make mrproper
   make headers_check
 }
 
 package() {
-  cd linux-${pkgver%.*}
+  cd linux-${_minor_ver}
   make INSTALL_HDR_PATH="$pkgdir/usr" headers_install
 
   # use headers from libdrm
-- 
cgit v1.2.3