summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2023-09-15 09:02:35 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2023-09-15 09:31:14 -0400
commitd5a37be5d25b605a3896c6245d818bcd2614d57e (patch)
tree5031a4a0ac08f9793e0faecd22b94731accee88f
parent0707bfd6d1c76ca3f3174026b2473fbaff00eadc (diff)
housekeeping - nornmalize _version_constraint() implementations across PKGBUILDs
-rw-r--r--libre/bibletime/PKGBUILD14
-rw-r--r--libre/blender/PKGBUILD24
-rw-r--r--libre/cups-filters/PKGBUILD8
-rw-r--r--libre/freecad/PKGBUILD13
-rw-r--r--libre/icedove-extension-enigmail/PKGBUILD16
-rw-r--r--libre/jami-qt/PKGBUILD8
-rw-r--r--libre/libxfce4ui/PKGBUILD8
-rw-r--r--libre/pyqt5/PKGBUILD13
-rw-r--r--libre/qt5-styleplugins/PKGBUILD11
-rw-r--r--libre/qt5-webkit/PKGBUILD8
-rw-r--r--libre/qutebrowser/PKGBUILD16
-rw-r--r--pcr-testing/calamares/PKGBUILD17
-rw-r--r--pcr/gnustep-gui/PKGBUILD9
-rw-r--r--pcr/lightspark/PKGBUILD11
-rw-r--r--pcr/puzzlemoppet-git/PKGBUILD13
-rw-r--r--pcr/pypolicyd-spf/PKGBUILD11
-rw-r--r--pcr/python-py3dns/PKGBUILD11
-rw-r--r--pcr/python-pyspf/PKGBUILD11
18 files changed, 112 insertions, 110 deletions
diff --git a/libre/bibletime/PKGBUILD b/libre/bibletime/PKGBUILD
index 434b4115e..9123326cf 100644
--- a/libre/bibletime/PKGBUILD
+++ b/libre/bibletime/PKGBUILD
@@ -42,7 +42,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -51,16 +51,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -98,8 +98,8 @@ build() {
}
package() {
- make -C build DESTDIR="$pkgdir" install
-
# pin to strongly-coupled dependency versions
- depends=( ${depends[*]/sword/$(_version_constraint sword 3)} )
+ depends=( ${depends[*]/sword/} $(_version_constraint sword 3) )
+
+ make -C build DESTDIR="$pkgdir" install
}
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index be3475e01..09e3b7f15 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -88,7 +88,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -97,16 +97,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -236,14 +236,14 @@ package() {
# libboost_filesystem.so <- openimageio,
# libboost_thread.so <- openshadinglanguage,
# libboost_iostreams.so <- openvdb
- depends+=( libboost_locale.so
- $(_version_constraint opencolorio 2) # eg: libOpenColorIO.so.2.1
- $(_version_constraint openexr 2) # eg: libHalf.so.12
- $(_version_constraint openimageio 2) # eg: libOpenImageIO.so.2.0
- $(_version_constraint openshadinglanguage 2) # eg: liboslcomp.so.1.10
- $(_version_constraint opensubdiv 3) # eg: libosdGPU.so.3.3.3
- $(_version_constraint openvdb 2) # eg: libopenvdb.so.6.2
- $(_version_constraint python 2) ) # eg: libpython3.6.so.1.0
+ depends+=( libboost_locale.so )
+ depends=( ${depends[*]/opencolorio/} $(_version_constraint opencolorio 2) ) # eg: libOpenColorIO.so.2.1
+ depends=( ${depends[*]/openexr/} $(_version_constraint openexr 2) ) # eg: libHalf.so.12
+ depends=( ${depends[*]/openimageio/} $(_version_constraint openimageio 2) ) # eg: libOpenImageIO.so.2.0
+ depends=( ${depends[*]/openshadinglanguage/} $(_version_constraint openshadinglanguage 2) ) # eg: liboslcomp.so.1.10
+ depends=( ${depends[*]/opensubdiv/} $(_version_constraint opensubdiv 3) ) # eg: libosdGPU.so.3.3.3
+ depends=( ${depends[*]/openvdb/} $(_version_constraint openvdb 2) ) # eg: libopenvdb.so.6.2
+ depends=( ${depends[*]/python/} $(_version_constraint python 2) ) # eg: libpython3.6.so.1.0
DESTDIR="${pkgdir}" cmake --install build
install -Dm755 release/bin/blender-softwaregl "${pkgdir}/usr/bin/blender-softwaregl"
diff --git a/libre/cups-filters/PKGBUILD b/libre/cups-filters/PKGBUILD
index e2202f255..3ad28388a 100644
--- a/libre/cups-filters/PKGBUILD
+++ b/libre/cups-filters/PKGBUILD
@@ -50,7 +50,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -59,16 +59,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
diff --git a/libre/freecad/PKGBUILD b/libre/freecad/PKGBUILD
index 5ceb70651..b24710434 100644
--- a/libre/freecad/PKGBUILD
+++ b/libre/freecad/PKGBUILD
@@ -64,7 +64,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -73,16 +73,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -137,9 +137,8 @@ build() {
package() {
# pin to strongly-coupled dependency versions
- depends=( ${depends[*]/boost-libs/} )
- depends+=( $(_version_constraint boost-libs 3)
- $(_version_constraint python 2) )
+ depends=( ${depends[*]/boost-libs/} $(_version_constraint boost-libs 3) )
+ depends+=( $(_version_constraint python 2) )
DESTDIR="$pkgdir" ninja -C build install
diff --git a/libre/icedove-extension-enigmail/PKGBUILD b/libre/icedove-extension-enigmail/PKGBUILD
index adb2a34df..f9765882e 100644
--- a/libre/icedove-extension-enigmail/PKGBUILD
+++ b/libre/icedove-extension-enigmail/PKGBUILD
@@ -14,6 +14,7 @@
# * replace 'thunderbird' dependency with 'icedove'
# * apply dependency version constraints
# * allow building arch-specific packages (different version constraints)
+# * pin to strongly-coupled dependency versions
_pkgname=thunderbird-extension-enigmail
@@ -57,7 +58,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -66,16 +67,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -117,10 +118,9 @@ build() {
}
package() {
- # parabola dependency version contraints
- local gnupg_constraints="$( _version_constraint 'gnupg' )"
- local icedove_constraints="$(_version_constraint 'icedove')"
- depends+=( ${gnupg_constraints} ${icedove_constraints} )
+ # pin to strongly-coupled dependency versions
+ depends=( ${depends[*]/gnupg/} $(_version_constraint 'gnupg' ) )
+ depends=( ${depends[*]/icedove/} $(_version_constraint 'icedove') )
# upstream min thunderbird version contraint
local min_icedove_ver=$(grep strict_min_version "${srcdir}"/enigmail/build-tb/dist/manifest.json | sed 's|.*: "\([0-9]*\)\..*|\1|g')
diff --git a/libre/jami-qt/PKGBUILD b/libre/jami-qt/PKGBUILD
index 315d33810..0c983d0a4 100644
--- a/libre/jami-qt/PKGBUILD
+++ b/libre/jami-qt/PKGBUILD
@@ -43,7 +43,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -52,16 +52,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
diff --git a/libre/libxfce4ui/PKGBUILD b/libre/libxfce4ui/PKGBUILD
index 28a7b2129..5be606f45 100644
--- a/libre/libxfce4ui/PKGBUILD
+++ b/libre/libxfce4ui/PKGBUILD
@@ -42,7 +42,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -51,16 +51,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
diff --git a/libre/pyqt5/PKGBUILD b/libre/pyqt5/PKGBUILD
index 4331b8a13..6fafd2bad 100644
--- a/libre/pyqt5/PKGBUILD
+++ b/libre/pyqt5/PKGBUILD
@@ -67,7 +67,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -76,16 +76,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -117,9 +117,8 @@ build() {
package_python-pyqt5(){
# pin to strongly-coupled dependency versions
- depends=( ${depends[*]/qt5-base/} \
- $(_version_constraint python 2) \
- $(_version_constraint qt5-base 3) )
+ depends=( ${depends[*]/qt5-base/} $(_version_constraint qt5-base 3) )
+ depends+=( $(_version_constraint python 2) )
cd PyQt5-$pkgver/build
make INSTALL_ROOT="$pkgdir" install
diff --git a/libre/qt5-styleplugins/PKGBUILD b/libre/qt5-styleplugins/PKGBUILD
index 760635198..b2d318ebd 100644
--- a/libre/qt5-styleplugins/PKGBUILD
+++ b/libre/qt5-styleplugins/PKGBUILD
@@ -42,7 +42,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -51,16 +51,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -104,8 +104,7 @@ build() {
package() {
# pin to strongly-coupled dependency versions
- depends=( ${depends[*]/qt5-base/} )
- depends+=( $(_version_constraint qt5-base 3) )
+ depends=( ${depends[*]/qt5-base/} $(_version_constraint qt5-base 3) )
cd qtstyleplugins-${_commit}
diff --git a/libre/qt5-webkit/PKGBUILD b/libre/qt5-webkit/PKGBUILD
index 85747d9c2..6663ba9ed 100644
--- a/libre/qt5-webkit/PKGBUILD
+++ b/libre/qt5-webkit/PKGBUILD
@@ -52,7 +52,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -61,16 +61,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD
index de99c60de..33d157337 100644
--- a/libre/qutebrowser/PKGBUILD
+++ b/libre/qutebrowser/PKGBUILD
@@ -62,7 +62,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -71,16 +71,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -118,11 +118,9 @@ build() {
package() {
# pin to strongly-coupled dependency versions
- depends=( ${depends[*]/python-pyqt5/} )
- depends=( ${depends[*]/qt5-base/} )
- depends+=( $(_version_constraint python 2) \
- $(_version_constraint python-pyqt5 ) \
- $(_version_constraint qt5-base 3) )
+ depends+=( $(_version_constraint python 2) )
+ depends=( ${depends[*]/python-pyqt5/} $(_version_constraint python-pyqt5 ) )
+ depends=( ${depends[*]/qt5-base/} $(_version_constraint qt5-base 3) )
cd "$pkgname-$pkgver"
make -f misc/Makefile DESTDIR="$pkgdir" PREFIX=/usr install
diff --git a/pcr-testing/calamares/PKGBUILD b/pcr-testing/calamares/PKGBUILD
index 6c27f1e6e..962cd6416 100644
--- a/pcr-testing/calamares/PKGBUILD
+++ b/pcr-testing/calamares/PKGBUILD
@@ -30,7 +30,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -39,16 +39,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -93,10 +93,11 @@ build()
package()
{
- depends+=( $(_version_constraint 'boost-libs') \
- $(_version_constraint 'icu' ) \
- $(_version_constraint 'kpmcore' ) \
- $(_version_constraint 'qt5-base' ) )
+ # pin to strongly-coupled dependency versions
+ depends=( ${depends[*]/boost-libs/} $(_version_constraint 'boost-libs') )
+ depends=( ${depends[*]/icu/} $(_version_constraint 'icu' ) )
+ depends=( ${depends[*]/kpmcore/} $(_version_constraint 'kpmcore' ) )
+ depends=( ${depends[*]/qt5-base/} $(_version_constraint 'qt5-base' ) )
cd "${srcdir}"/${pkgname}/build
diff --git a/pcr/gnustep-gui/PKGBUILD b/pcr/gnustep-gui/PKGBUILD
index ec5110b2f..0ee33daef 100644
--- a/pcr/gnustep-gui/PKGBUILD
+++ b/pcr/gnustep-gui/PKGBUILD
@@ -56,7 +56,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -65,16 +65,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -101,6 +101,7 @@ build() {
}
package() {
+ # pin to strongly-coupled dependency versions
depends+=( $(_version_constraint gnustep-base 2) )
cd "$srcdir"/$pkgname-$pkgver
diff --git a/pcr/lightspark/PKGBUILD b/pcr/lightspark/PKGBUILD
index 6f4cbf823..3ad53adc8 100644
--- a/pcr/lightspark/PKGBUILD
+++ b/pcr/lightspark/PKGBUILD
@@ -41,7 +41,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -50,16 +50,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -105,7 +105,8 @@ build()
package()
{
- depends+=( $(_version_constraint 'boost-libs') )
+ # pin to strongly-coupled dependency versions
+ depends=( ${depends[*]/boost-libs/} $(_version_constraint 'boost-libs') )
cd "${srcdir}"/${pkgname}-${pkgver}/build
diff --git a/pcr/puzzlemoppet-git/PKGBUILD b/pcr/puzzlemoppet-git/PKGBUILD
index 0b0f0f09b..5b14babf2 100644
--- a/pcr/puzzlemoppet-git/PKGBUILD
+++ b/pcr/puzzlemoppet-git/PKGBUILD
@@ -29,7 +29,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -38,16 +38,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -90,9 +90,10 @@ build()
package()
{
- cd "${srcdir}/${pkgname}/puzzlemoppet"
+ # pin to strongly-coupled dependency versions
+ depends=( ${depends[*]/ode/} $(_version_constraint 'ode') )
- depends+=( $(_version_constraint 'ode') )
+ cd "${srcdir}/${pkgname}/puzzlemoppet"
make install DESTDIR=$pkgdir
}
diff --git a/pcr/pypolicyd-spf/PKGBUILD b/pcr/pypolicyd-spf/PKGBUILD
index 55ffda9ef..d2236a077 100644
--- a/pcr/pypolicyd-spf/PKGBUILD
+++ b/pcr/pypolicyd-spf/PKGBUILD
@@ -36,7 +36,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -45,16 +45,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -80,7 +80,8 @@ build() {
}
package() {
- depends+=( $(_version_constraint 'python') )
+ # pin to strongly-coupled dependency versions
+ depends=( ${depends[*]/python/} $(_version_constraint python 2) )
cd "$srcdir"/$pkgname-$pkgver
diff --git a/pcr/python-py3dns/PKGBUILD b/pcr/python-py3dns/PKGBUILD
index d3b685405..4f1e33ccb 100644
--- a/pcr/python-py3dns/PKGBUILD
+++ b/pcr/python-py3dns/PKGBUILD
@@ -31,7 +31,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -40,16 +40,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -69,7 +69,8 @@ _version_constraint() # (dep_pkgname [precision])
package() {
- depends+=( $(_version_constraint 'python') )
+ # pin to strongly-coupled dependency versions
+ depends=( ${depends[*]/python/} $(_version_constraint python 2) )
cd "$srcdir"/$_pkgname-$pkgver
diff --git a/pcr/python-pyspf/PKGBUILD b/pcr/python-pyspf/PKGBUILD
index 807be14e4..bf5a8b622 100644
--- a/pcr/python-pyspf/PKGBUILD
+++ b/pcr/python-pyspf/PKGBUILD
@@ -30,7 +30,7 @@ _version_constraint() # (dep_pkgname [precision])
local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
local def_precision=$(( n_dots + 1 ))
local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
- local precision=$( (( is_prec_valid )) && echo ${req_precision} || echo ${def_precision} )
+ local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
local pkgver_rx='[0-9A-Za-z_]+'
pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
# but some pkgver have it (eg: 5.15.10+kde+r130)
@@ -39,16 +39,16 @@ _version_constraint() # (dep_pkgname [precision])
local garbage_rx='[^0-9].*'
local capture_rx=${pkgver_rx}
for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
- local version pkgrel has_split_char version_min version_max constraint_string
+ local version pkgrel has_dot_char version_min version_max constraint_string
declare -i subver subver_inc pkgrel_inc
if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
#unused=${BASH_REMATCH[2]} # discarded pkgver segments
pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed
- has_split_char=$(grep '\.' <<<${version} &> /dev/null ; echo $((! $?)) ; )
+ has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
- version=$( ((has_split_char)) && echo ${version%.*}.${subver} || echo ${subver} )
+ version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
subver_inc=$(( subver + 1 ))
pkgrel_inc=$(( pkgrel + 1 ))
version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \
@@ -74,7 +74,8 @@ build() {
}
package() {
- depends+=( $(_version_constraint 'python') )
+ # pin to strongly-coupled dependency versions
+ depends=( ${depends[*]/python/} $(_version_constraint python 2) )
cd "$srcdir/pyspf-$pkgver"