commit:     030f1c32076968280354a107d467b6afbea470aa
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 06:20:56 2022 +0000
Commit:     罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 06:21:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030f1c32

dev-db/postgresql: Fix llvm useflag logic

Closes: https://bugs.gentoo.org/836863
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 dev-db/postgresql/postgresql-12.10-r1.ebuild | 2 +-
 dev-db/postgresql/postgresql-12.9-r1.ebuild  | 2 +-
 dev-db/postgresql/postgresql-13.5-r1.ebuild  | 2 +-
 dev-db/postgresql/postgresql-13.6-r2.ebuild  | 2 +-
 dev-db/postgresql/postgresql-14.1-r1.ebuild  | 2 +-
 dev-db/postgresql/postgresql-14.2-r1.ebuild  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-db/postgresql/postgresql-12.10-r1.ebuild 
b/dev-db/postgresql/postgresql-12.10-r1.ebuild
index 633f0fbc22e9..b34da8d7f42d 100644
--- a/dev-db/postgresql/postgresql-12.10-r1.ebuild
+++ b/dev-db/postgresql/postgresql-12.10-r1.ebuild
@@ -102,7 +102,7 @@ src_prepare() {
        sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
        use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
-       use server && eapply "${FILESDIR}/postgres-llvm14.patch"
+       use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
 
        if use pam ; then
                sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \

diff --git a/dev-db/postgresql/postgresql-12.9-r1.ebuild 
b/dev-db/postgresql/postgresql-12.9-r1.ebuild
index 632776c855b4..d747cba6e9ec 100644
--- a/dev-db/postgresql/postgresql-12.9-r1.ebuild
+++ b/dev-db/postgresql/postgresql-12.9-r1.ebuild
@@ -102,7 +102,7 @@ src_prepare() {
        sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
        use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
-       use server && eapply "${FILESDIR}/postgres-llvm14.patch"
+       use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
 
        if use pam ; then
                sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \

diff --git a/dev-db/postgresql/postgresql-13.5-r1.ebuild 
b/dev-db/postgresql/postgresql-13.5-r1.ebuild
index 5314562ffd4c..2fe896fdb183 100644
--- a/dev-db/postgresql/postgresql-13.5-r1.ebuild
+++ b/dev-db/postgresql/postgresql-13.5-r1.ebuild
@@ -104,7 +104,7 @@ src_prepare() {
        sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
        use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
-       use server && eapply "${FILESDIR}/postgres-llvm14.patch"
+       use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
 
        if use pam ; then
                sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \

diff --git a/dev-db/postgresql/postgresql-13.6-r2.ebuild 
b/dev-db/postgresql/postgresql-13.6-r2.ebuild
index 62f436ef042b..3ecf907af22e 100644
--- a/dev-db/postgresql/postgresql-13.6-r2.ebuild
+++ b/dev-db/postgresql/postgresql-13.6-r2.ebuild
@@ -104,7 +104,7 @@ src_prepare() {
        sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
        use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
-       use server && eapply "${FILESDIR}/postgres-llvm14.patch"
+       use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
 
        if use pam ; then
                sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \

diff --git a/dev-db/postgresql/postgresql-14.1-r1.ebuild 
b/dev-db/postgresql/postgresql-14.1-r1.ebuild
index b1037df39b6f..4865e372312f 100644
--- a/dev-db/postgresql/postgresql-14.1-r1.ebuild
+++ b/dev-db/postgresql/postgresql-14.1-r1.ebuild
@@ -103,7 +103,7 @@ src_prepare() {
        sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
        use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch"
-       use server && eapply "${FILESDIR}/postgres-llvm14.patch"
+       use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
 
        if use pam ; then
                sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \

diff --git a/dev-db/postgresql/postgresql-14.2-r1.ebuild 
b/dev-db/postgresql/postgresql-14.2-r1.ebuild
index 5d0ca44d23aa..669ad0e26b8a 100644
--- a/dev-db/postgresql/postgresql-14.2-r1.ebuild
+++ b/dev-db/postgresql/postgresql-14.2-r1.ebuild
@@ -100,7 +100,7 @@ src_prepare() {
        sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
        use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch"
-       use server && eapply "${FILESDIR}/postgres-llvm14.patch"
+       use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
 
        if use pam ; then
                sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \

Reply via email to