From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1374481-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 C33EA15808B
	for <garchives@archives.gentoo.org>; Sat, 12 Mar 2022 00:10:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id AFB0FE0867;
	Sat, 12 Mar 2022 00:10:47 +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 21316E0826
	for <gentoo-commits@lists.gentoo.org>; Sat, 12 Mar 2022 00:10:47 +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 DA3CA342F10
	for <gentoo-commits@lists.gentoo.org>; Sat, 12 Mar 2022 00:10:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 221AF2B0
	for <gentoo-commits@lists.gentoo.org>; Sat, 12 Mar 2022 00:10:44 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1647043790.6566d4988d100cbbfb4fec194576e69bc53d7386.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch x11-misc/xscreensaver/xscreensaver-6.03.ebuild
X-VCS-Directories: x11-misc/xscreensaver/ x11-misc/xscreensaver/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 6566d4988d100cbbfb4fec194576e69bc53d7386
X-VCS-Branch: master
Date: Sat, 12 Mar 2022 00:10:44 +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: 7cc5e4c0-0b1d-4c8c-a5c7-c7b46a0cf43c
X-Archives-Hash: 9afe86d1284c11b1db1a300905ef1d37

commit:     6566d4988d100cbbfb4fec194576e69bc53d7386
Author:     Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Fri Mar  4 18:34:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 00:09:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6566d498

x11-misc/xscreensaver: fix configure with USE=-opengl

Deliberately disabling opengl became a fatal error in configure.

Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
Closes: https://bugs.gentoo.org/834582
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/24404
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/xscreensaver-6.03-without-gl-configure.patch        | 11 +++++++++++
 x11-misc/xscreensaver/xscreensaver-6.03.ebuild                |  1 +
 2 files changed, 12 insertions(+)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch
new file mode 100644
index 000000000000..9d741072f4e1
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch
@@ -0,0 +1,11 @@
+diff -urP xscreensaver-6.03.orig/configure.ac xscreensaver-6.03/configure.ac
+--- xscreensaver-6.03.orig/configure.ac	2022-03-04 11:23:24.415172769 -0700
++++ xscreensaver-6.03/configure.ac	2022-03-04 11:27:40.419205257 -0700
+@@ -4737,7 +4737,6 @@
+     CONF_STATUS=1
+   elif test "$with_gl_req" = no ; then
+     noteL 'The OpenGL 3D library is not being used.'
+-    CONF_STATUS=1
+   else
+     noteL 'The OpenGL 3D library was not found.'
+     CONF_STATUS=1

diff --git a/x11-misc/xscreensaver/xscreensaver-6.03.ebuild b/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
index 815313c79b32..c56932d1468c 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
@@ -91,6 +91,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
 	"${FILESDIR}"/${PN}-6.01-gtk-detection.patch
 	"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
+	"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
 )
 
 DOCS=( README{,.hacking} )