From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9A6E81584AD for ; Sat, 03 May 2025 04:58:46 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 7ACF8343122 for ; Sat, 03 May 2025 04:58:46 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 98ED011036D; Sat, 03 May 2025 04:58:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 8E8E311036D for ; Sat, 03 May 2025 04:58:42 +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 353A8343126 for ; Sat, 03 May 2025 04:58:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 97139183E for ; Sat, 03 May 2025 04:58:40 +0000 (UTC) From: "Sam James" 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" Message-ID: <1746248294.b3e6f910ef8cf28cbbfecc0bd98844082c856657.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/cgit/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/cgit/cgit-1.2.3-r203.ebuild www-apps/cgit/cgit-1.2.3_p20240802.ebuild www-apps/cgit/cgit-9999-r1.ebuild www-apps/cgit/cgit-9999.ebuild X-VCS-Directories: www-apps/cgit/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b3e6f910ef8cf28cbbfecc0bd98844082c856657 X-VCS-Branch: master Date: Sat, 03 May 2025 04:58:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b649a786-6f59-46b3-ab79-5e6baafc0fc6 X-Archives-Hash: f7dbd3758b617a46d2c31f8d4dae9d0b commit: b3e6f910ef8cf28cbbfecc0bd98844082c856657 Author: Sam James gentoo org> AuthorDate: Sat May 3 04:57:35 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat May 3 04:58:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e6f910 www-apps/cgit: build w/ -std=gnu17 These can be dropped w/ newer git but not going to test that right now. Closes: https://bugs.gentoo.org/951555 Signed-off-by: Sam James gentoo.org> www-apps/cgit/cgit-1.2.3-r203.ebuild | 7 +++++-- www-apps/cgit/cgit-1.2.3_p20240802.ebuild | 5 ++++- www-apps/cgit/cgit-9999-r1.ebuild | 8 ++++++-- www-apps/cgit/cgit-9999.ebuild | 8 ++++++-- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/www-apps/cgit/cgit-1.2.3-r203.ebuild b/www-apps/cgit/cgit-1.2.3-r203.ebuild index 10bd2be664b3..78ee22ac8b71 100644 --- a/www-apps/cgit/cgit-1.2.3-r203.ebuild +++ b/www-apps/cgit/cgit-1.2.3-r203.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..12} ) WEBAPP_MANUAL_SLOT="yes" -inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp +inherit flag-o-matic lua-single python-single-r1 tmpfiles toolchain-funcs webapp [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" @@ -61,6 +61,9 @@ src_configure() { mv "${WORKDIR}"/git-"${GIT_V}" git || die fi + # bug #951555 + append-cflags -std=gnu17 + echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed" echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed" echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo CGIT_SCRIPT_PATH failed" diff --git a/www-apps/cgit/cgit-1.2.3_p20240802.ebuild b/www-apps/cgit/cgit-1.2.3_p20240802.ebuild index 7b4f19a25e7e..8380152773c3 100644 --- a/www-apps/cgit/cgit-1.2.3_p20240802.ebuild +++ b/www-apps/cgit/cgit-1.2.3_p20240802.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..13} ) WEBAPP_MANUAL_SLOT="yes" -inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp +inherit flag-o-matic lua-single python-single-r1 tmpfiles toolchain-funcs webapp [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" @@ -66,6 +66,9 @@ src_configure() { mv "${WORKDIR}"/git-"${GIT_V}" git || die fi + # bug #951555 + append-cflags -std=gnu17 + echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed" echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed" echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo CGIT_SCRIPT_PATH failed" diff --git a/www-apps/cgit/cgit-9999-r1.ebuild b/www-apps/cgit/cgit-9999-r1.ebuild index 8b6fded5c051..648f5145540e 100644 --- a/www-apps/cgit/cgit-9999-r1.ebuild +++ b/www-apps/cgit/cgit-9999-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..12} ) WEBAPP_MANUAL_SLOT="yes" -inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3 +inherit flag-o-matic lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" @@ -68,6 +68,10 @@ src_configure() { rmdir git || die mv "${WORKDIR}"/git-"${GIT_V}" git || die fi + + # bug #951555 + append-cflags -std=gnu17 + echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed" echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed" echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo CGIT_SCRIPT_PATH failed" diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild index 1fab1a1e34a9..8412f8c1677a 100644 --- a/www-apps/cgit/cgit-9999.ebuild +++ b/www-apps/cgit/cgit-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..12} ) WEBAPP_MANUAL_SLOT="yes" -inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3 +inherit flag-o-matic lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" @@ -65,6 +65,10 @@ src_configure() { rmdir git || die mv "${WORKDIR}"/git-"${GIT_V}" git || die fi + + # bug #951555 + append-cflags -std=gnu17 + echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed" echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed" echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo CGIT_SCRIPT_PATH failed"