commit: 20328089a31020c984f446bd0fbba7141aa1610b Author: Patrick Lauer <patrick <AT> gentoo <DOT> org> AuthorDate: Thu May 9 17:16:36 2024 +0000 Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org> CommitDate: Thu May 9 17:17:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20328089
dev-db/postgresql: Migrate to llvm-r1 eclass Also add LLVM-18 support Closes: https://bugs.gentoo.org/931638 Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org> ...{postgresql-12.19.ebuild => postgresql-12.19-r1.ebuild} | 14 +++++++------- ...{postgresql-13.15.ebuild => postgresql-13.15-r1.ebuild} | 14 +++++++------- ...{postgresql-14.12.ebuild => postgresql-14.12-r1.ebuild} | 14 +++++++------- .../{postgresql-15.7.ebuild => postgresql-15.7-r1.ebuild} | 14 +++++++------- .../{postgresql-16.3.ebuild => postgresql-16.3-r1.ebuild} | 14 +++++++------- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dev-db/postgresql/postgresql-12.19.ebuild b/dev-db/postgresql/postgresql-12.19-r1.ebuild similarity index 98% rename from dev-db/postgresql/postgresql-12.19.ebuild rename to dev-db/postgresql/postgresql-12.19-r1.ebuild index 6636a63fe0ba..f27ea205217e 100644 --- a/dev-db/postgresql/postgresql-12.19.ebuild +++ b/dev-db/postgresql/postgresql-12.19-r1.ebuild @@ -4,9 +4,9 @@ EAPI=8 PYTHON_COMPAT=( python3_{10,11,12} ) -LLVM_MAX_SLOT=17 +LLVM_COMPAT=( {15..18} ) -inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles +inherit flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" @@ -35,10 +35,10 @@ virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) -llvm? ( - <sys-devel/llvm-18:= - <sys-devel/clang-18:= -) +llvm? ( $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + sys-devel/llvm:${LLVM_SLOT} + ') ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( ${PYTHON_DEPS} ) @@ -83,7 +83,7 @@ selinux? ( sec-policy/selinux-postgresql ) " pkg_setup() { - use llvm && llvm_pkg_setup + use llvm && llvm-r1_pkg_setup use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup diff --git a/dev-db/postgresql/postgresql-13.15.ebuild b/dev-db/postgresql/postgresql-13.15-r1.ebuild similarity index 98% rename from dev-db/postgresql/postgresql-13.15.ebuild rename to dev-db/postgresql/postgresql-13.15-r1.ebuild index 7c9361e616b7..e5b1f11e7279 100644 --- a/dev-db/postgresql/postgresql-13.15.ebuild +++ b/dev-db/postgresql/postgresql-13.15-r1.ebuild @@ -4,9 +4,9 @@ EAPI=8 PYTHON_COMPAT=( python3_{10,11,12} ) -LLVM_MAX_SLOT=17 +LLVM_COMPAT=( {15..18} ) -inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles +inherit flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" @@ -35,10 +35,10 @@ virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) -llvm? ( - <sys-devel/llvm-18:= - <sys-devel/clang-18:= -) +llvm? ( $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + sys-devel/llvm:${LLVM_SLOT} + ') ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( ${PYTHON_DEPS} ) @@ -83,7 +83,7 @@ selinux? ( sec-policy/selinux-postgresql ) " pkg_setup() { - use llvm && llvm_pkg_setup + use llvm && llvm-r1_pkg_setup use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup diff --git a/dev-db/postgresql/postgresql-14.12.ebuild b/dev-db/postgresql/postgresql-14.12-r1.ebuild similarity index 98% rename from dev-db/postgresql/postgresql-14.12.ebuild rename to dev-db/postgresql/postgresql-14.12-r1.ebuild index 210c8c8e5180..ebd55f9ca242 100644 --- a/dev-db/postgresql/postgresql-14.12.ebuild +++ b/dev-db/postgresql/postgresql-14.12-r1.ebuild @@ -4,9 +4,9 @@ EAPI=8 PYTHON_COMPAT=( python3_{10,11,12} ) -LLVM_MAX_SLOT=17 +LLVM_COMPAT=( {15..18} ) -inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles +inherit flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" @@ -35,10 +35,10 @@ virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) -llvm? ( - <sys-devel/llvm-18:= - <sys-devel/clang-18:= -) +llvm? ( $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + sys-devel/llvm:${LLVM_SLOT} + ') ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) @@ -84,7 +84,7 @@ selinux? ( sec-policy/selinux-postgresql ) " pkg_setup() { - use llvm && llvm_pkg_setup + use llvm && llvm-r1_pkg_setup use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup diff --git a/dev-db/postgresql/postgresql-15.7.ebuild b/dev-db/postgresql/postgresql-15.7-r1.ebuild similarity index 98% rename from dev-db/postgresql/postgresql-15.7.ebuild rename to dev-db/postgresql/postgresql-15.7-r1.ebuild index 7007decc6340..a232b763f4c7 100644 --- a/dev-db/postgresql/postgresql-15.7.ebuild +++ b/dev-db/postgresql/postgresql-15.7-r1.ebuild @@ -4,9 +4,9 @@ EAPI=8 PYTHON_COMPAT=( python3_{10,11,12} ) -LLVM_MAX_SLOT=17 +LLVM_COMPAT=( {15..18} ) -inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles +inherit flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" @@ -35,10 +35,10 @@ virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) -llvm? ( - <sys-devel/llvm-18:= - <sys-devel/clang-18:= -) +llvm? ( $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + sys-devel/llvm:${LLVM_SLOT} + ') ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) @@ -85,7 +85,7 @@ selinux? ( sec-policy/selinux-postgresql ) " pkg_setup() { - use llvm && llvm_pkg_setup + use llvm && llvm-r1_pkg_setup use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup diff --git a/dev-db/postgresql/postgresql-16.3.ebuild b/dev-db/postgresql/postgresql-16.3-r1.ebuild similarity index 98% rename from dev-db/postgresql/postgresql-16.3.ebuild rename to dev-db/postgresql/postgresql-16.3-r1.ebuild index 127fc5f4fe3f..50afc8d706aa 100644 --- a/dev-db/postgresql/postgresql-16.3.ebuild +++ b/dev-db/postgresql/postgresql-16.3-r1.ebuild @@ -4,9 +4,9 @@ EAPI=8 PYTHON_COMPAT=( python3_{10,11,12} ) -LLVM_MAX_SLOT=17 +LLVM_COMPAT=( {15..18} ) -inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles +inherit flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" @@ -36,10 +36,10 @@ virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap:= ) -llvm? ( - <sys-devel/llvm-18:= - <sys-devel/clang-18:= -) +llvm? ( $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + sys-devel/llvm:${LLVM_SLOT} + ') ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) @@ -86,7 +86,7 @@ selinux? ( sec-policy/selinux-postgresql ) " pkg_setup() { - use llvm && llvm_pkg_setup + use llvm && llvm-r1_pkg_setup use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
