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

7 files changed, 111 insertions, 146 deletions

diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD
index 8343ad32a..7fe934c68 100644
--- a/libre/acpi_call/PKGBUILD
+++ b/libre/acpi_call/PKGBUILD
@@ -7,40 +7,39 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 _kernelname=
-_basekernel=3.16
 
 if [[ ${_kernelname} == "" ]]; then
-  _basekernel=${_basekernel}
+  _basekernel=3.16
   _archrel=11
   _parabolarel=2
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=3.14
   _archrel=7
-  _parabolarel=2
+  _parabolarel=3
 elif [[ ${_kernelname} == -grsec ]]; then
-  _basekernel=3.15
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -lts-grsec ]]; then
   _basekernel=3.14
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -lts-knock ]]; then
   _basekernel=3.10
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -rt ]]; then
   _basekernel=3.14
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -pae ]]; then
-  _basekernel=${_basekernel}
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -xen ]]; then
-  _basekernel=${_basekernel}
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 fi
 
 _pkgname=acpi_call
@@ -62,6 +61,9 @@ replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}"
 [[ -n ${_kernelname} ]] && replaces+=("${_pkgname}${_kernelname}-parabola")
 conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
 [[ -n ${_kernelname} ]] && conflicts+=("${_pkgname}${_kernelname}-parabola")
+if [[ ${_kernelname} != "" ]]; then
+  provides=("${_pkgname}")
+fi
 
 install='kmod.install'
 source=("${url}/archive/v${pkgver}.tar.gz")
diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD
index 71b1d982f..600902794 100644
--- a/libre/bbswitch/PKGBUILD
+++ b/libre/bbswitch/PKGBUILD
@@ -6,42 +6,39 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 _kernelname=
-_basekernel=3.16
-_archrel=15
-_parabolarel=2
 
 if [[ ${_kernelname} == "" ]]; then
-  _basekernel=${_basekernel}
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=15
+  _parabolarel=2
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=3.14
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -grsec ]]; then
-  _basekernel=3.15
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -lts-grsec ]]; then
   _basekernel=3.14
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -lts-knock ]]; then
   _basekernel=3.10
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -rt ]]; then
   _basekernel=3.14
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -pae ]]; then
-  _basekernel=${_basekernel}
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -xen ]]; then
-  _basekernel=${_basekernel}
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 fi
 
 _pkgname=bbswitch
@@ -61,6 +58,9 @@ makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_
 
 replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
 conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
+if [[ ${_kernelname} != "" ]]; then
+  provides=("${_pkgname}")
+fi
 
 install='kmod.install'
 source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
diff --git a/libre/java-common/PKGBUILD b/libre/java-common/PKGBUILD
index 8d29576e8..88d3f66a0 100644
--- a/libre/java-common/PKGBUILD
+++ b/libre/java-common/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 pkgname=java-common
 pkgver=1
-pkgrel=7.parabola1
+pkgrel=8.parabola1
 pkgdesc='Common files for Java Environments (Parabola rebranded)'
 arch=('any')
 url='parabolagnulinux.org'
diff --git a/libre/java-common/install_java-common.sh b/libre/java-common/install_java-common.sh
index 5ba935e2b..c9910e8bf 100644
--- a/libre/java-common/install_java-common.sh
+++ b/libre/java-common/install_java-common.sh
@@ -1,43 +1,4 @@
-JVM_DIR=/usr/lib/jvm
-OLD_DEFAULT_NAME=java-default-runtime
-OLD_DEFAULT_PATH=${JVM_DIR}/${OLD_DEFAULT_NAME}
-DEFAULT_NAME=default
-DEFAULT_PATH=${JVM_DIR}/${DEFAULT_NAME}
-DEFAULT_NAME_JRE=default-runtime
-DEFAULT_PATH_JRE=${JVM_DIR}/${DEFAULT_NAME_JRE}
-
-# $1: Java environment name to set as default
-set_default_link_to() {
-  new_default=$1
-  unlink ${DEFAULT_PATH} 2>/dev/null
-  ln -sf ${new_default} ${DEFAULT_PATH}
-
-  unlink ${DEFAULT_PATH_JRE} 2>/dev/null
-  if [[ ${new_default} == */jre ]]; then
-    ln -sf ${new_default} ${DEFAULT_PATH_JRE}
-  else
-    ln -sf ${new_default}/jre ${DEFAULT_PATH_JRE}
-  fi
-}
-
-pre_install() {
-  _curr_def=$(readlink ${OLD_DEFAULT_PATH} && true)
-  if [ -n "${_curr_def}" ]; then
-    unlink ${OLD_DEFAULT_PATH} > /dev/null 2>&1
-    ln -sf ${DEFAULT_NAME} ${OLD_DEFAULT_PATH}
-
-    set_default_link_to ${_curr_def}
-  fi
-}
-
-pre_upgrade() {
-  pre_install "$@"
-}
-
 post_install() {
-  echo 'Installing multiple non-conflicting Java environments is now supported'
-  echo 'Check the following wiki section for more info:'
-  echo '  https://wiki.parabolagnulinux.org/index.php/Java'
   echo 'Please make sure JAVA_HOME is set to /usr/lib/jvm/default'
   echo 'If not, you may have to logout and login again to set it according to /etc/profile.d/jre.sh'
 }
diff --git a/libre/lirc/PKGBUILD b/libre/lirc/PKGBUILD
index 8912bfe0e..d5d6d29a1 100644
--- a/libre/lirc/PKGBUILD
+++ b/libre/lirc/PKGBUILD
@@ -5,42 +5,39 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 _kernelname=
-_basekernel=3.16
-_archrel=3
-_parabolarel=2
 
 if [[ ${_kernelname} == "" ]]; then
-  _basekernel=${_basekernel}
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=3
+  _parabolarel=2
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=3.14
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -grsec ]]; then
-  _basekernel=3.15
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -lts-grsec ]]; then
   _basekernel=3.14
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -lts-knock ]]; then
   _basekernel=3.10
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -rt ]]; then
   _basekernel=3.14
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -pae ]]; then
-  _basekernel=${_basekernel}
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -xen ]]; then
-  _basekernel=${_basekernel}
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 fi
 
 pkgbase=lirc
@@ -122,6 +119,9 @@ package_lirc() {
   conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
   [[ -n ${_kernelname} ]] && conflicts+=("${_pkgname}${_kernelname}-parabola")
   replaces+=("${pkgbase}+pctv")
+  if [[ ${_kernelname} != "" ]]; then
+    provides=("${_pkgname}")
+  fi
   install=kmod.install
 
   cd "${srcdir}/${pkgbase}-${_pkgver}/drivers"
diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD
index fb56d06c8..46c30465c 100644
--- a/libre/tp_smapi/PKGBUILD
+++ b/libre/tp_smapi/PKGBUILD
@@ -11,40 +11,39 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 _kernelname=
-_basekernel=3.16
 
 if [[ ${_kernelname} == "" ]]; then
-  _basekernel=${_basekernel}
+  _basekernel=3.16
   _archrel=52
   _parabolarel=2
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=3.14
-  _archrel=29
-  _parabolarel=2
+  _archrel=30
+  _parabolarel=1
 elif [[ ${_kernelname} == -grsec ]]; then
-  _basekernel=3.15
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -lts-grsec ]]; then
   _basekernel=3.14
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -lts-knock ]]; then
   _basekernel=3.10
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -rt ]]; then
   _basekernel=3.14
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -pae ]]; then
-  _basekernel=${_basekernel}
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -xen ]]; then
-  _basekernel=${_basekernel}
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 fi
 
 _pkgname=tp_smapi
@@ -64,6 +63,9 @@ makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_
 
 replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
 conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
+if [[ ${_kernelname} != "" ]]; then
+  provides=("${_pkgname}")
+fi
 
 install='kmod.install'
 source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD
index 04241760e..f146ef6f1 100644
--- a/libre/vhba-module/PKGBUILD
+++ b/libre/vhba-module/PKGBUILD
@@ -6,42 +6,39 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 _kernelname=
-_basekernel=3.16
-_archrel=6
-_parabolarel=2
 
 if [[ ${_kernelname} == "" ]]; then
-  _basekernel=${_basekernel}
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=6
+  _parabolarel=2
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=3.14
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -grsec ]]; then
-  _basekernel=3.15
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -lts-grsec ]]; then
   _basekernel=3.14
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -lts-knock ]]; then
   _basekernel=3.10
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -rt ]]; then
   _basekernel=3.14
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -pae ]]; then
-  _basekernel=${_basekernel}
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 elif [[ ${_kernelname} == -xen ]]; then
-  _basekernel=${_basekernel}
-  _archrel=${_archrel}
-  _parabolarel=${_parabolarel}
+  _basekernel=3.16
+  _archrel=1
+  _parabolarel=1
 fi
 
 _pkgname=vhba-module
@@ -61,6 +58,9 @@ makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_
 
 replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
 conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
+if [[ ${_kernelname} != "" ]]; then
+  provides=("${_pkgname}")
+fi
 
 options=(!makeflags)
 install='kmod.install'