From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1382890-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 7E18D15808B
	for <garchives@archives.gentoo.org>; Wed,  6 Apr 2022 06:21:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1C2D1E0954;
	Wed,  6 Apr 2022 06:21:51 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id AE455E0954
	for <gentoo-commits@lists.gentoo.org>; Wed,  6 Apr 2022 06:21:49 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id DFEB634133C
	for <gentoo-commits@lists.gentoo.org>; Wed,  6 Apr 2022 06:21:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F8332A7
	for <gentoo-commits@lists.gentoo.org>; Wed,  6 Apr 2022 06:21:45 +0000 (UTC)
From: "罗百科" <patrick@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "罗百科" <patrick@gentoo.org>
Message-ID: <1649226102.030f1c32076968280354a107d467b6afbea470aa.patrick@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/postgresql/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-db/postgresql/postgresql-12.10-r1.ebuild dev-db/postgresql/postgresql-12.9-r1.ebuild dev-db/postgresql/postgresql-13.5-r1.ebuild dev-db/postgresql/postgresql-13.6-r2.ebuild dev-db/postgresql/postgresql-14.1-r1.ebuild dev-db/postgresql/postgresql-14.2-r1.ebuild
X-VCS-Directories: dev-db/postgresql/
X-VCS-Committer: patrick
X-VCS-Committer-Name: 罗百科
X-VCS-Revision: 030f1c32076968280354a107d467b6afbea470aa
X-VCS-Branch: master
Date: Wed,  6 Apr 2022 06:21:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 61bab125-ea2a-4c39-bb63-4e5cc5c5a7b8
X-Archives-Hash: fac77c39ad97162695c800488a0f202f

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}/" \