Dependencies fix

2 files changed, 71 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3559029a8bae..611b626a4d27 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 6.0.1
-# Fri Jan 21 18:02:21 UTC 2022
+# Mon Jan 24 19:37:56 UTC 2022
 pkgbase = php54
 	pkgdesc = PHP 5.4.45 compiled as to not conflict with mainline php
 	pkgver = 5.4.45
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.php.net
 	arch = x86_64
 	license = PHP
@@ -213,7 +213,6 @@ pkgname = php54-mysql
 	pkgdesc = MySQL modules for php54
 	depends = php54=5.4.45
 	depends = php54-pdo=5.4.45
-	depends = php54-openssl=5.4.45
 
 pkgname = php54-phar
 	pkgdesc = phar module for php54
@@ -255,7 +254,6 @@ pkgname = php54-dba
 	pkgdesc = dba module for php54
 	depends = php54=5.4.45
 	depends = db
-	depends = lmdb
 
 pkgname = php54-pgsql
 	pkgdesc = PostgreSQL modules for php54
@@ -303,7 +301,6 @@ pkgname = php54-gd
 	depends = libxpm
 	depends = libpng
 	depends = libjpeg
-	depends = libvpx
 
 pkgname = php54-exif
 	pkgdesc = exif module for php54
@@ -377,7 +374,6 @@ pkgname = php54-enchant
 pkgname = php54-intl
 	pkgdesc = intl module for php54
 	depends = php54=5.4.45
-	depends = icu
 
 pkgname = php54-calendar
 	pkgdesc = calendar module for php54
@@ -396,7 +392,6 @@ pkgname = php54-ftp
 	pkgdesc = FTP module for php54
 	depends = php54=5.4.45
 	depends = openssl-1.0
-	depends = openssl
 
 pkgname = php54-curl
 	pkgdesc = curl module for php54
@@ -408,7 +403,6 @@ pkgname = php54-snmp
 	depends = php54=5.4.45
 	depends = net-snmp
 	depends = openssl-1.0
-	depends = openssl
 
 pkgname = php54-ldap
 	pkgdesc = ldap module for php54
@@ -418,13 +412,12 @@ pkgname = php54-ldap
 
 pkgname = php54-imap
 	pkgdesc = imap module for php54
+	depends = php54=5.4.45
 	depends = pam
 	depends = krb5
 	depends = c-client
 	depends = libxcrypt
-	depends = php54=5.4.45
 	depends = openssl-1.0
-	depends = openssl
 
 pkgname = php54-mcrypt
 	pkgdesc = mcrypt module for php54
diff --git a/PKGBUILD b/PKGBUILD
index 909fa5e3e0ff..0c81e2f58622 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
 _phpbase="54"
 _suffix=""
 pkgver="5.4.45"
-pkgrel="3"
+pkgrel="4"
 pkgbase="php54"
 pkgdesc="PHP 5.4.45 compiled as to not conflict with mainline php"
 _cppflags=" -DU_USING_ICU_NAMESPACE=1  -DOPENSSL_NO_SSL3=1  -DOPENSSL_NO_SSL2=1  -DU_DEFINE_FALSE_AND_TRUE=1 "
@@ -221,6 +221,61 @@ _sapi_depends=(
     "pcre2"
     "libedit"
 )
+_ext_depends_snmp=(
+    "php54=5.4.45"
+    "net-snmp"
+    "openssl-1.0"
+)
+_ext_depends_ftp=(
+    "php54=5.4.45"
+    "openssl-1.0"
+)
+_ext_depends_intl=(
+    "php54=5.4.45"
+)
+_ext_depends_imap=(
+    "php54=5.4.45"
+    "pam"
+    "krb5"
+    "c-client"
+    "libxcrypt"
+    "openssl-1.0"
+)
+_ext_depends_gd=(
+    "php54=5.4.45"
+    "gd"
+    "libxpm"
+    "libpng"
+    "libjpeg"
+)
+_ext_depends_mysql=(
+    "php54=5.4.45"
+    "php54-pdo=5.4.45"
+)
+_ext_depends_dba=(
+    "php54=5.4.45"
+    "db"
+)
+_ext_depends_odbc=(
+    "php54=5.4.45"
+    "unixodbc"
+    "php54-pdo=5.4.45"
+)
+_ext_depends_pgsql=(
+    "php54=5.4.45"
+    "postgresql-libs"
+    "php54-pdo=5.4.45"
+)
+_ext_depends_firebird=(
+    "php54=5.4.45"
+    "libfbclient"
+    "php54-pdo=5.4.45"
+)
+_ext_depends_sqlite=(
+    "php54=5.4.45"
+    "sqlite"
+    "php54-pdo=5.4.45"
+)
 _phpconfig="\
     --prefix=/usr \
     --sbindir=/usr/bin \
@@ -1068,13 +1123,7 @@ package_php54-xsl() {
 # MySQL
 package_php54-mysql() {
     pkgdesc="MySQL modules for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}")
-    if ((_build_shared_pdo)); then
-        depends+=("php${_phpbase}-pdo${_suffix}=${pkgver}")
-    fi
-    if ((_build_shared_openssl)); then
-        depends+=("php${_phpbase}-openssl${_suffix}=${pkgver}")
-    fi
+    depends=("${_ext_depends_mysql[@]}")
     _install_module mysqlnd
     _install_module mysql
     _install_module mysqli
@@ -1084,10 +1133,7 @@ package_php54-mysql() {
 # pdo_sqlite + sqlite3
 package_php54-sqlite() {
     pkgdesc="sqlite module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" 'sqlite')
-    if ((_build_shared_pdo)); then
-        depends+=("php${_phpbase}-pdo${_suffix}=${pkgver}")
-    fi
+    depends=("${_ext_depends_sqlite[@]}")
     _install_module sqlite3
     _install_module pdo_sqlite
 }
@@ -1095,10 +1141,7 @@ package_php54-sqlite() {
 # ODBC
 package_php54-odbc() {
     pkgdesc="ODBC modules for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" 'unixodbc')
-    if ((_build_shared_pdo)); then
-        depends+=("php${_phpbase}-pdo${_suffix}=${pkgver}")
-    fi
+    depends=("${_ext_depends_odbc[@]}")
     _install_module odbc
     _install_module pdo_odbc
 }
@@ -1106,10 +1149,7 @@ package_php54-odbc() {
 # PostgreSQL
 package_php54-pgsql() {
     pkgdesc="PostgreSQL modules for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" 'postgresql-libs')
-    if ((_build_shared_pdo)); then
-        depends+=("php${_phpbase}-pdo${_suffix}=${pkgver}")
-    fi
+    depends=("${_ext_depends_pgsql[@]}")
     _install_module pgsql
     _install_module pdo_pgsql
 }
@@ -1124,10 +1164,7 @@ package_php54-interbase() {
 # firebird
 package_php54-firebird() {
     pkgdesc="pdo_firebird module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" "libfbclient")
-    if ((_build_shared_pdo)); then
-        depends+=("php${_phpbase}-pdo${_suffix}=${pkgver}")
-    fi
+    depends=("${_ext_depends_firebird[@]}")
     _install_module pdo_firebird
 }
 
@@ -1148,10 +1185,7 @@ package_php54-mssql() {
 # Dba
 package_php54-dba() {
     pkgdesc="dba module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" 'db')
-    if ((_build_uses_lmdb)); then
-        depends+=('lmdb')
-    fi
+    depends=("${_ext_depends_dba[@]}")
     _install_module dba
 }
 
@@ -1162,12 +1196,10 @@ package_php54-dba() {
 # Intl
 package_php54-intl() {
     pkgdesc="intl module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}")
+    depends=("${_ext_depends_intl[@]}")
     if ((_build_with_custom_icu)); then
         # Patch to proper path inside intl.so
         patchelf --set-rpath "/usr/lib/${pkgbase}/icu${_pkgver_icu}/lib" "build-cli/modules/intl.so"
-    else
-        depends+=('icu')
     fi
     _install_module intl
 }
@@ -1208,13 +1240,7 @@ package_php54-calendar() {
 # GD
 package_php54-gd() {
     pkgdesc="gd module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" 'gd')
-    if ((_build_bundled_gd)); then
-        depends+=('libxpm' 'libpng' 'libjpeg')
-    fi
-    if ((_phpbase >= 55 && _phpbase < 72)); then
-        depends+=('libvpx');
-    fi
+    depends=("${_ext_depends_gd[@]}")
     _install_module gd
 }
 
@@ -1308,12 +1334,7 @@ package_php54-soap() {
 # FTP
 package_php54-ftp() {
     pkgdesc="FTP module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}")
-    if ((_build_openssl_v10_patch)); then
-        depends+=("openssl-1.0")
-    else
-        depends+=("openssl")
-    fi
+    depends=("${_ext_depends_ftp[@]}")
     _install_module ftp
 }
 
@@ -1327,12 +1348,7 @@ package_php54-ldap() {
 # SNMP
 package_php54-snmp() {
     pkgdesc="snmp module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" 'net-snmp')
-    if ((_build_openssl_v10_patch)); then
-        depends+=('openssl-1.0');
-    else
-        depends+=('openssl');
-    fi
+    depends=("${_ext_depends_snmp[@]}")
     _install_module snmp
 }
 
@@ -1346,12 +1362,7 @@ package_php54-xmlrpc() {
 # Imap
 package_php54-imap() {
     pkgdesc="imap module for ${pkgbase}"
-    depends=('pam' 'krb5' 'c-client' 'libxcrypt' "${pkgbase}=${pkgver}");
-    if ((_build_openssl_v10_patch)); then
-        depends+=("openssl-1.0")
-    else
-        depends+=("openssl")
-    fi
+    depends=("${_ext_depends_imap[@]}")
    _install_module imap
 }
 
@@ -1445,10 +1456,7 @@ package_php54-sysvshm() {
 # Ffi
 package_php54-ffi() {
     pkgdesc="ffi module for ${pkgbase}"
-    depends=(
-        'libffi'
-        "${pkgbase}=${pkgver}"
-    )
+    depends=("${pkgbase}=${pkgver}" 'libffi')
    _install_module ffi
 }