libre/linux-libre-api-headers: updated to 4.15.2_gnu

1 files changed, 23 insertions, 27 deletions

diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index 9b90b0332..e083dc256 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,56 +1,52 @@
-# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# $Id$
+# Maintainer (Arch):  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor (Arch): Allan McRae <allan@archlinux.org>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: André Silva <emulatorman@hyperbola.info>
 
-# Based on linux-api-headers package
+# parabola changes and rationale (based on core/linux-api-headers):
+#  - changing upstream source url to linux-libre
 
-# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=linux-libre-api-headers
-_pkgbasever=4.12-gnu
-_pkgver=4.12.7-gnu
-
-_srcname=linux-${_pkgbasever%-*}
-_archpkgver=${_pkgver%-*}
-pkgver=${_pkgver//-/_}
-pkgrel=1.1
+pkgver=4.15.2_gnu
+_basever=${pkgver%.*_gnu}
+pkgrel=1
 pkgdesc='Kernel headers sanitized for use in userspace'
-arch=('i686' 'x86_64' 'armv7h')
-url='https://www.gnu.org/software/libc'
+arch=(any)
+url='http://www.gnu.org/software/libc'
 license=(GPL2)
-provides=("linux-api-headers=${_archpkgver}")
+provides=('linux-api-headers')
 conflicts=('linux-api-headers')
 replaces=('linux-api-headers')
-source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"{,.sign}
-        "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"{,.sign})
-sha256sums=('aed9811320395f9217af89fafb3e287d339f6eddd3422263ccee68ff9a5c7194'
+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})
+sha256sums=('e6556514286f9cd6b46f5d5769b2cc3c61ac7d6fa9c9c400e3c2fb5949490186'
             'SKIP'
-            'be18a25fb02b3aaffb7c4d766e60c6d93569deb092e4bf0eaa75cc778adaaf37'
+            '81ec59f4d123f7b8bb358c765b4cae32979c6859816641f4830e6c87dc974875'
             'SKIP')
 validpgpkeys=('474402C8C582DAFBE389C427BCB7CF877E7D47A7') # Alexandre Oliva
 
 prepare() {
-  cd ${_srcname}
-
-  # add upstream patch
-  if [ "${_pkgbasever}" != "${_pkgver}" ]; then
-    patch -p1 -i "$srcdir/patch-${_pkgbasever}-${_pkgver}"
-  fi
+  cd linux-${_basever}
+  [[ ${pkgver%_gnu} != $_basever ]] && patch -p1 -i "$srcdir/patch-${_basever}-gnu-${pkgver//_/-}"
 }
 
 build() {
-  cd ${_srcname}
+  cd linux-${_basever}
 
   make mrproper
   make headers_check
 }
 
 package() {
-  cd ${_srcname}
-  make INSTALL_HDR_PATH="$pkgdir"/usr headers_install
+  cd linux-${_basever}
+  make INSTALL_HDR_PATH="$pkgdir/usr" headers_install
 
   # use headers from libdrm
-  rm -r "$pkgdir"/usr/include/drm
+  rm -r "$pkgdir/usr/include/drm"
   
   # clean-up unnecessary files generated during install
   find "$pkgdir" \( -name .install -o -name ..install.cmd \) -delete