diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-08-24 16:06:08 -0300 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-08-24 16:06:08 -0300 |
commit | 5d304f22a33e15fb2d5178c781e18325fea37854 (patch) | |
tree | 7b8602b2f0870bb2ed058b968811e52abe07d09c /libre | |
parent | d991fd8d10c04b20907fe6397dbe3cd6a691d0c7 (diff) | |
parent | 90aca6b17865eafd41b20a46ad76ec58c9126a29 (diff) |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
Diffstat (limited to 'libre')
-rw-r--r-- | libre/acpi_call-parabola-grsec/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/acpi_call-parabola-lts/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/acpi_call-parabola/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/bbswitch-parabola-grsec/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/bbswitch-parabola-lts/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/bbswitch-parabola/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/lirc-parabola-grsec/PKGBUILD | 20 | ||||
-rw-r--r-- | libre/lirc-parabola-lts/PKGBUILD | 20 | ||||
-rw-r--r-- | libre/lirc-parabola/PKGBUILD | 20 | ||||
-rw-r--r-- | libre/tp_smapi-parabola-grsec/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/tp_smapi-parabola-lts/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/tp_smapi-parabola/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/vhba-module-parabola-grsec/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/vhba-module-parabola-lts/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/vhba-module-parabola/PKGBUILD | 2 |
15 files changed, 48 insertions, 48 deletions
diff --git a/libre/acpi_call-parabola-grsec/PKGBUILD b/libre/acpi_call-parabola-grsec/PKGBUILD index 4e17173f0..a0a96adf2 100644 --- a/libre/acpi_call-parabola-grsec/PKGBUILD +++ b/libre/acpi_call-parabola-grsec/PKGBUILD @@ -20,10 +20,10 @@ source=("${url}/archive/v${pkgver}.tar.gz") sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') # Package info -pkgrel=12.${_basekernel/./} +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' -_replaces=("${_pkgname}" "${_pkgname}-libre") +_replaces=("${_pkgname}") # Generic (you shouldn't have to modify any of these variables) pkgname=${_pkgname}-parabola${_kernelname} @@ -33,7 +33,7 @@ depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}< makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") replaces=( "${_replaces[@]/%/${_kernelname}}") conflicts=("${_replaces[@]/%/${_kernelname}}") -provides=( "${_replaces[@]/%/${_kernelname}=${_pkgver}}") +provides=( "${_replaces[@]/%/${_kernelname}=${pkgver}}") if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/acpi_call-parabola-lts/PKGBUILD b/libre/acpi_call-parabola-lts/PKGBUILD index 8487dcbd9..107dcbaca 100644 --- a/libre/acpi_call-parabola-lts/PKGBUILD +++ b/libre/acpi_call-parabola-lts/PKGBUILD @@ -20,10 +20,10 @@ source=("${url}/archive/v${pkgver}.tar.gz") sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') # Package info -pkgrel=12.${_basekernel/./} +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' -_replaces=("${_pkgname}" "${_pkgname}-libre") +_replaces=("${_pkgname}") # Generic (you shouldn't have to modify any of these variables) pkgname=${_pkgname}-parabola${_kernelname} @@ -33,7 +33,7 @@ depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}< makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") replaces=( "${_replaces[@]/%/${_kernelname}}") conflicts=("${_replaces[@]/%/${_kernelname}}") -provides=( "${_replaces[@]/%/${_kernelname}=${_pkgver}}") +provides=( "${_replaces[@]/%/${_kernelname}=${pkgver}}") if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/acpi_call-parabola/PKGBUILD b/libre/acpi_call-parabola/PKGBUILD index 02552d841..bb1c7ed9b 100644 --- a/libre/acpi_call-parabola/PKGBUILD +++ b/libre/acpi_call-parabola/PKGBUILD @@ -20,10 +20,10 @@ source=("${url}/archive/v${pkgver}.tar.gz") sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') # Package info -pkgrel=12.${_basekernel/./} +pkgrel=11 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' -_replaces=("${_pkgname}" "${_pkgname}-libre") +_replaces=("${_pkgname}") # Generic (you shouldn't have to modify any of these variables) pkgname=${_pkgname}-parabola${_kernelname} @@ -33,7 +33,7 @@ depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}< makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") replaces=( "${_replaces[@]/%/${_kernelname}}") conflicts=("${_replaces[@]/%/${_kernelname}}") -provides=( "${_replaces[@]/%/${_kernelname}=${_pkgver}}") +provides=( "${_replaces[@]/%/${_kernelname}=${pkgver}}") if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/bbswitch-parabola-grsec/PKGBUILD b/libre/bbswitch-parabola-grsec/PKGBUILD index e00800dfa..ef50d0b53 100644 --- a/libre/bbswitch-parabola-grsec/PKGBUILD +++ b/libre/bbswitch-parabola-grsec/PKGBUILD @@ -20,7 +20,7 @@ source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807') # Package info -pkgrel=16.${_basekernel/./} +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' diff --git a/libre/bbswitch-parabola-lts/PKGBUILD b/libre/bbswitch-parabola-lts/PKGBUILD index 77f4f1385..fcc404c5d 100644 --- a/libre/bbswitch-parabola-lts/PKGBUILD +++ b/libre/bbswitch-parabola-lts/PKGBUILD @@ -20,7 +20,7 @@ source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807') # Package info -pkgrel=16.${_basekernel/./} +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' diff --git a/libre/bbswitch-parabola/PKGBUILD b/libre/bbswitch-parabola/PKGBUILD index 5874cc622..4a3a2f8df 100644 --- a/libre/bbswitch-parabola/PKGBUILD +++ b/libre/bbswitch-parabola/PKGBUILD @@ -20,7 +20,7 @@ source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807') # Package info -pkgrel=16.${_basekernel/./} +pkgrel=15 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' diff --git a/libre/lirc-parabola-grsec/PKGBUILD b/libre/lirc-parabola-grsec/PKGBUILD index d8fa2f122..b0e04451f 100644 --- a/libre/lirc-parabola-grsec/PKGBUILD +++ b/libre/lirc-parabola-grsec/PKGBUILD @@ -15,7 +15,7 @@ if [[ -n "${_kernelname}" ]]; then pkgname=$_pkgname else pkgbase=$_pkgname - pkgname=("$_pkgname" lirc-utils-parabola) + pkgname=("$_pkgname" lirc-parabola-utils) fi _pkgver=0.9.1a @@ -35,7 +35,7 @@ md5sums=('1f1fac162ed309dd50f307e96a292957' 'febf25c154a7d36f01159e84f26c2d9a') # Package info -pkgrel=1.${_basekernel/./} +pkgrel=1 epoch=1 arch=('i686' 'x86_64' 'mips64el') options=('!makeflags' '!strip') @@ -82,14 +82,14 @@ build() { _package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules (built for the linux-libre${_kernelname} kernel package)" - depends=('lirc-libre-utils' "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") + depends=('lirc-utils' "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") replaces=('lirc+pctv') [[ -z "$_kernelname" ]] || provides=("lirc-parabola=${pkgver}") install=kmod.install - replaces+=( "lirc${_kernelname}" "lirc-libre${_kernelname}") - conflicts+=("lirc${_kernelname}" "lirc-libre${_kernelname}") - provides+=( "lirc${_kernelname}=${pkgver}" "lirc-libre${_kernelname}=${pkgver}") + replaces+=("lirc${_kernelname}") + conflicts+=("lirc${_kernelname}") + provides+=("lirc${_kernelname}=${pkgver}") cd "${srcdir}/lirc-${_pkgver}/drivers" @@ -107,16 +107,16 @@ else eval "package_${_pkgname}() { _package_lirc; }" fi -package_lirc-utils-parabola() { +package_lirc-parabola-utils() { pkgdesc="Linux Infrared Remote Control utilities" 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-utils-libre') - conflicts=('lirc-utils' 'lirc-utils-libre') - provides=( "lirc-utils=$pkgver" "lirc-utils-libre=$pkgver") + replaces=('lirc-utils') + conflicts=('lirc-utils') + provides=("lirc-utils=$pkgver") install=kmod.install cd "${srcdir}/lirc-${_pkgver}" diff --git a/libre/lirc-parabola-lts/PKGBUILD b/libre/lirc-parabola-lts/PKGBUILD index e9e3e4bd5..15a503e3a 100644 --- a/libre/lirc-parabola-lts/PKGBUILD +++ b/libre/lirc-parabola-lts/PKGBUILD @@ -15,7 +15,7 @@ if [[ -n "${_kernelname}" ]]; then pkgname=$_pkgname else pkgbase=$_pkgname - pkgname=("$_pkgname" lirc-utils-parabola) + pkgname=("$_pkgname" lirc-parabola-utils) fi _pkgver=0.9.1a @@ -35,7 +35,7 @@ md5sums=('1f1fac162ed309dd50f307e96a292957' 'febf25c154a7d36f01159e84f26c2d9a') # Package info -pkgrel=1.${_basekernel/./} +pkgrel=1 epoch=1 arch=('i686' 'x86_64' 'mips64el') options=('!makeflags' '!strip') @@ -82,14 +82,14 @@ build() { _package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules (built for the linux-libre${_kernelname} kernel package)" - depends=('lirc-libre-utils' "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") + depends=('lirc-utils' "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") replaces=('lirc+pctv') [[ -z "$_kernelname" ]] || provides=("lirc-parabola=${pkgver}") install=kmod.install - replaces+=( "lirc${_kernelname}" "lirc-libre${_kernelname}") - conflicts+=("lirc${_kernelname}" "lirc-libre${_kernelname}") - provides+=( "lirc${_kernelname}=${pkgver}" "lirc-libre${_kernelname}=${pkgver}") + replaces+=("lirc${_kernelname}") + conflicts+=("lirc${_kernelname}") + provides+=("lirc${_kernelname}=${pkgver}") cd "${srcdir}/lirc-${_pkgver}/drivers" @@ -107,16 +107,16 @@ else eval "package_${_pkgname}() { _package_lirc; }" fi -package_lirc-utils-parabola() { +package_lirc-parabola-utils() { pkgdesc="Linux Infrared Remote Control utilities" 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-utils-libre') - conflicts=('lirc-utils' 'lirc-utils-libre') - provides=( "lirc-utils=$pkgver" "lirc-utils-libre=$pkgver") + replaces=('lirc-utils') + conflicts=('lirc-utils') + provides=("lirc-utils=$pkgver") install=kmod.install cd "${srcdir}/lirc-${_pkgver}" diff --git a/libre/lirc-parabola/PKGBUILD b/libre/lirc-parabola/PKGBUILD index 6892f9a8a..c57af293c 100644 --- a/libre/lirc-parabola/PKGBUILD +++ b/libre/lirc-parabola/PKGBUILD @@ -15,7 +15,7 @@ if [[ -n "${_kernelname}" ]]; then pkgname=$_pkgname else pkgbase=$_pkgname - pkgname=("$_pkgname" lirc-utils-parabola) + pkgname=("$_pkgname" lirc-parabola-utils) fi _pkgver=0.9.1a @@ -37,7 +37,7 @@ md5sums=('1f1fac162ed309dd50f307e96a292957' 'febf25c154a7d36f01159e84f26c2d9a') # Package info -pkgrel=3.${_basekernel/./} +pkgrel=3 epoch=1 arch=('i686' 'x86_64' 'mips64el') options=('!makeflags' '!strip') @@ -85,14 +85,14 @@ build() { _package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules (built for the linux-libre${_kernelname} kernel package)" - depends=('lirc-libre-utils' "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") + depends=('lirc-utils' "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") replaces=('lirc+pctv') [[ -z "$_kernelname" ]] || provides=("lirc-parabola=${pkgver}") install=kmod.install - replaces+=( "lirc${_kernelname}" "lirc-libre${_kernelname}") - conflicts+=("lirc${_kernelname}" "lirc-libre${_kernelname}") - provides+=( "lirc${_kernelname}=${pkgver}" "lirc-libre${_kernelname}=${pkgver}") + replaces+=("lirc${_kernelname}") + conflicts+=("lirc${_kernelname}") + provides+=("lirc${_kernelname}=${pkgver}") cd "${srcdir}/lirc-${_pkgver}/drivers" @@ -110,16 +110,16 @@ else eval "package_${_pkgname}() { _package_lirc; }" fi -package_lirc-utils-parabola() { +package_lirc-parabola-utils() { pkgdesc="Linux Infrared Remote Control utilities" 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-utils-libre') - conflicts=('lirc-utils' 'lirc-utils-libre') - provides=( "lirc-utils=$pkgver" "lirc-utils-libre=$pkgver") + replaces=('lirc-utils') + conflicts=('lirc-utils') + provides=("lirc-utils=$pkgver") install=kmod.install cd "${srcdir}/lirc-${_pkgver}" diff --git a/libre/tp_smapi-parabola-grsec/PKGBUILD b/libre/tp_smapi-parabola-grsec/PKGBUILD index 3db1aa984..582fb78fa 100644 --- a/libre/tp_smapi-parabola-grsec/PKGBUILD +++ b/libre/tp_smapi-parabola-grsec/PKGBUILD @@ -25,7 +25,7 @@ source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.t md5sums=('63c683415c764568f6bf17c7eabe4752') # Package info -pkgrel=53.${_basekernel/./} +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' diff --git a/libre/tp_smapi-parabola-lts/PKGBUILD b/libre/tp_smapi-parabola-lts/PKGBUILD index 5a64013b2..a070d1fa8 100644 --- a/libre/tp_smapi-parabola-lts/PKGBUILD +++ b/libre/tp_smapi-parabola-lts/PKGBUILD @@ -25,7 +25,7 @@ source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.t md5sums=('63c683415c764568f6bf17c7eabe4752') # Package info -pkgrel=53.${_basekernel/./} +pkgrel=29 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' diff --git a/libre/tp_smapi-parabola/PKGBUILD b/libre/tp_smapi-parabola/PKGBUILD index 3f1818f6b..e3fcce1ab 100644 --- a/libre/tp_smapi-parabola/PKGBUILD +++ b/libre/tp_smapi-parabola/PKGBUILD @@ -25,7 +25,7 @@ source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.t md5sums=('63c683415c764568f6bf17c7eabe4752') # Package info -pkgrel=53.${_basekernel/./} +pkgrel=52 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' diff --git a/libre/vhba-module-parabola-grsec/PKGBUILD b/libre/vhba-module-parabola-grsec/PKGBUILD index eb0e9214e..d41a87302 100644 --- a/libre/vhba-module-parabola-grsec/PKGBUILD +++ b/libre/vhba-module-parabola-grsec/PKGBUILD @@ -22,7 +22,7 @@ md5sums=('6b307a80df9c163768cc7ecb3ccebb71' '4dc37dc348b5a2c83585829bde790dcc') # Package info -pkgrel=7.${_basekernel/./} +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') options=(!makeflags) install=$_pkgname.install diff --git a/libre/vhba-module-parabola-lts/PKGBUILD b/libre/vhba-module-parabola-lts/PKGBUILD index d6f99bef9..2a58763e4 100644 --- a/libre/vhba-module-parabola-lts/PKGBUILD +++ b/libre/vhba-module-parabola-lts/PKGBUILD @@ -22,7 +22,7 @@ md5sums=('6b307a80df9c163768cc7ecb3ccebb71' '4dc37dc348b5a2c83585829bde790dcc') # Package info -pkgrel=7.${_basekernel/./} +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') options=(!makeflags) install=$_pkgname.install diff --git a/libre/vhba-module-parabola/PKGBUILD b/libre/vhba-module-parabola/PKGBUILD index a5b0f3fa2..43c28cfcf 100644 --- a/libre/vhba-module-parabola/PKGBUILD +++ b/libre/vhba-module-parabola/PKGBUILD @@ -22,7 +22,7 @@ md5sums=('6b307a80df9c163768cc7ecb3ccebb71' '4dc37dc348b5a2c83585829bde790dcc') # Package info -pkgrel=7.${_basekernel/./} +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') options=(!makeflags) install=$_pkgname.install |