From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 29AAE158094 for ; Fri, 9 Sep 2022 12:40:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D035E08C3; Fri, 9 Sep 2022 12:40:28 +0000 (UTC) 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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2E3FCE08C3 for ; Fri, 9 Sep 2022 12:40:28 +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 12E8A33BEBB for ; Fri, 9 Sep 2022 12:40:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E4BAD4 for ; Fri, 9 Sep 2022 12:40:25 +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: <1662727159.3af14d6d35ff6cef88c5e21642f2b95d10d0bc44.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild sys-libs/ncurses/ncurses-6.3_p20220903.ebuild X-VCS-Directories: sys-libs/ncurses/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3af14d6d35ff6cef88c5e21642f2b95d10d0bc44 X-VCS-Branch: master Date: Fri, 9 Sep 2022 12:40:25 +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: dc5ba5b3-e29a-431b-b161-ca78df21e1d5 X-Archives-Hash: 91c964dff1d94a4dc109e3f0976503a0 commit: 3af14d6d35ff6cef88c5e21642f2b95d10d0bc44 Author: Sam James gentoo org> AuthorDate: Fri Sep 9 12:38:48 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 9 12:39:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af14d6d sys-libs/ncurses: tweak patch logic Signed-off-by: Sam James gentoo.org> sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild | 11 ++++++++--- sys-libs/ncurses/ncurses-6.3_p20220903.ebuild | 13 +++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild index c8f854c99411..9985db97618b 100644 --- a/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild +++ b/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild @@ -14,6 +14,11 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )" +GENTOO_PATCH_DEV=sam +GENTOO_PATCH_PV=6.3_p20220903 +GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches + +# Populated below in a loop. Do not add patches manually here. UPSTREAM_PATCHES=() if [[ ${PV} == *_p* ]] ; then @@ -103,7 +108,7 @@ if [[ ${PV} == *_p* ]] ; then unset my_patch_index fi - SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.3_p20220903-patches.tar.xz" + SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz" fi LICENSE="MIT" @@ -134,7 +139,7 @@ PATCHES=( # # For the same reasons, please include the original configure.in changes, # NOT just the generated results! - "${WORKDIR}"/${PN}-6.3_p20220903-patches + "${WORKDIR}"/${GENTOO_PATCH_NAME} ) src_unpack() { @@ -145,7 +150,7 @@ src_unpack() { if [[ ${file} == ${MY_P}.tar.gz ]] ; then verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig else - [[ ${file} == @(patches.tar.xz|*.asc|*.sig) ]] && continue + [[ ${file} == @(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc fi diff --git a/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild index 389f5c864ed5..eb7e04b8ff07 100644 --- a/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild +++ b/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild @@ -14,6 +14,11 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )" +GENTOO_PATCH_DEV=sam +GENTOO_PATCH_PV=6.3_p20220903 +GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches + +# Populated below in a loop. Do not add patches manually here. UPSTREAM_PATCHES=() if [[ ${PV} == *_p* ]] ; then @@ -103,13 +108,13 @@ if [[ ${PV} == *_p* ]] ; then unset my_patch_index fi - SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.3_p20220903-patches.tar.xz" + SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz" fi LICENSE="MIT" # The subslot reflects the SONAME. SLOT="0/6" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="ada +cxx debug doc gpm minimal profile +stack-realign static-libs test tinfo trace" RESTRICT="!test? ( test )" @@ -134,7 +139,7 @@ PATCHES=( # # For the same reasons, please include the original configure.in changes, # NOT just the generated results! - "${WORKDIR}"/${PN}-6.3_p20220903-patches + "${WORKDIR}"/${GENTOO_PATCH_NAME} ) src_unpack() { @@ -145,7 +150,7 @@ src_unpack() { if [[ ${file} == ${MY_P}.tar.gz ]] ; then verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig else - [[ ${file} == @(patches.tar.xz|*.asc|*.sig) ]] && continue + [[ ${file} == @(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc fi