Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

1 files changed, 26 insertions, 25 deletions

diff --git a/libre/lirc-parabola/PKGBUILD b/libre/lirc-parabola/PKGBUILD
index a6bc51d22..a90fe7638 100644
--- a/libre/lirc-parabola/PKGBUILD
+++ b/libre/lirc-parabola/PKGBUILD
@@ -7,16 +7,17 @@
 _basekernel=3.16
 _kernelname=
 
-_pkgname=lirc${_kernelname}-parabola
-pkgbase=${_pkgname%-*}
-pkgname=("$_pkgname" lirc-utils-parabola)
+
+pkgbase=lirc
+_pkgname=${pkgbase}${_kernelname}-parabola
+pkgname=("$_pkgname" "${pkgbase}-utils-parabola")
 _pkgver=0.9.1a
 [[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver"
 pkgrel=3.2
 epoch=1
 _extramodules=extramodules-${_basekernel}${_kernelname}
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.lirc.org/"
+url="http://www.$pkgbase.org/"
 license=('GPL')
 # NOTICE: Don't forget to bump version in depends in package_lirc()!
 makedepends=('help2man' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
@@ -29,10 +30,10 @@ makedepends+=("linux-libre${_kernelname}>=${_basekernel}"         "linux-libre${
 options=('!makeflags' '!strip')
 source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${_pkgver}.tar.bz2"
         wpc8769l-build-fix.patch
-        lirc-0.9.1a-fix-segfaults.patch
-        lirc.logrotate
+        ${pkgbase}-0.9.1a-fix-segfaults.patch
+        ${pkgbase}.logrotate
         irexec.service
-        lirc.tmpfiles)
+        ${pkgbase}.tmpfiles)
 md5sums=('1f1fac162ed309dd50f307e96a292957'
          '9ec33169b3407f74264062d7679dd269'
          'cd00acf480e82a0bf050032732d0d733'
@@ -44,7 +45,7 @@ prepare() {
   cd "${srcdir}/lirc-${_pkgver}"
 
   patch -Np1 -i "${srcdir}/wpc8769l-build-fix.patch"
-  patch -Np1 -i "${srcdir}/lirc-0.9.1a-fix-segfaults.patch"
+  patch -Np1 -i "${srcdir}/${pkgbase}-0.9.1a-fix-segfaults.patch"
 
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -e 's/@X_CFLAGS@//g' \
@@ -57,7 +58,7 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/lirc-${_pkgver}"
+  cd "${srcdir}/${pkgbase}-${_pkgver}"
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
   PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
@@ -76,14 +77,14 @@ build() {
 
 _package_lirc-parabola() {
   pkgdesc="Linux Infrared Remote Control kernel modules (built for the linux-libre${_kernelname} kernel package)"
-  depends=('lirc-utils' "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
-  replaces=('lirc+pctv')
+  depends=("${pkgbase}-utils" "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
+  replaces=("${pkgbase}+pctv")
   install=kmod.install
-  replaces+=("lirc${_kernelname}" "lirc-libre${_kernelname}")
-  conflicts+=("lirc${_kernelname}" "lirc-libre${_kernelname}")
-  provides+=("lirc${_kernelname}=${pkgver}")
+  replaces+=("${pkgbase}${_kernelname}" "${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
+  conflicts+=("${pkgbase}${_kernelname}" "${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
+  provides+=("${pkgbase}${_kernelname}=${pkgver}")
 
-  cd "${srcdir}/lirc-${_pkgver}/drivers"
+  cd "${srcdir}/${pkgbase}-${_pkgver}/drivers"
 
   make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install
   gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}"/*.ko
@@ -100,24 +101,24 @@ package_lirc-utils-parabola() {
   depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman')
   optdepends=('python2: pronto2lirc utility')
   options=('strip')
-  backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf')
-  replaces=('lirc-utils' 'lirc-libre-utils')
-  conflicts=('lirc-utils' 'lirc-libre-utils')
-  provides=("lirc-utils=$pkgver")
-  install=lirc-utils.install
+  backup=("etc/${pkgbase}/${pkgbase}_options.conf" "etc/${pkgbase}/${pkgbase}d.conf" "etc/${pkgbase}/${pkgbase}md.conf")
+  replaces=("${pkgbase}-utils" "${pkgbase}-libre-utils")
+  conflicts=("${pkgbase}-utils" "${pkgbase}-libre-utils")
+  provides=("${pkgbase}-utils=$pkgver")
+  install=${pkgbase}-utils.install
 
-  cd "${srcdir}/lirc-${_pkgver}"
+  cd "${srcdir}/${pkgbase}-${_pkgver}"
 
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service
-  install -Dm644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf
+  install -Dm644 "${srcdir}"/${pkgbase}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgbase}.conf
 
-  cp -rp remotes "${pkgdir}/usr/share/lirc"
-  chmod -R go-w "${pkgdir}/usr/share/lirc/"
+  cp -rp remotes "${pkgdir}/usr/share/${pkgbase}"
+  chmod -R go-w "${pkgdir}/usr/share/${pkgbase}/"
 
   # install the logrotate config
-  install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
+  install -Dm644 "${srcdir}/${pkgbase}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgbase}"
     
   # remove built modules
   rm -r "${pkgdir}/usr/lib/modules"