commit: 0d94a77719386e44754afde048423c95de3266d3 Author: Sungjoon Moon <sumoon <AT> seoulsaram <DOT> org> AuthorDate: Tue May 27 05:46:04 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Tue May 27 09:22:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d94a777
app-shells/bash: Fix VariableOrderWrong CI error variable S should occur before IUSE Signed-off-by: Sungjoon Moon <sumoon <AT> seoulsaram.org> Part-of: https://github.com/gentoo/gentoo/pull/42240 Closes: https://github.com/gentoo/gentoo/pull/42240 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> app-shells/bash/bash-2.05b_p13.ebuild | 4 ++-- app-shells/bash/bash-3.0_p22.ebuild | 4 ++-- app-shells/bash/bash-3.1_p23.ebuild | 4 ++-- app-shells/bash/bash-3.2_p57.ebuild | 4 ++-- app-shells/bash/bash-4.0_p44.ebuild | 4 ++-- app-shells/bash/bash-4.1_p17.ebuild | 4 ++-- app-shells/bash/bash-4.2_p53.ebuild | 4 ++-- app-shells/bash/bash-4.3_p48-r2.ebuild | 4 ++-- app-shells/bash/bash-4.4_p23-r2.ebuild | 4 ++-- app-shells/bash/bash-5.0_p18-r3.ebuild | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild index 0a7f888d82f6..bb0392ca2a3c 100644 --- a/app-shells/bash/bash-2.05b_p13.ebuild +++ b/app-shells/bash/bash-2.05b_p13.ebuild @@ -39,6 +39,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"; fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-2" SLOT="${MY_PV}" KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86" @@ -51,8 +53,6 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" -S="${WORKDIR}/${MY_P}" - PATCHES=( "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-2.05b-destdir.patch "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/autoconf-mktime-2.53.patch # bug #220040 diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild index 7ab38a60533b..6a9d1dc0e02a 100644 --- a/app-shells/bash/bash-3.0_p22.ebuild +++ b/app-shells/bash/bash-3.0_p22.ebuild @@ -39,6 +39,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"; fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-2" SLOT="${MY_PV}" KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86" @@ -51,8 +53,6 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" -S="${WORKDIR}/${MY_P}" - PATCHES=( "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/autoconf-mktime-2.53.patch "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.0-protos.patch diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild index 720379daf4ca..de9635116e93 100644 --- a/app-shells/bash/bash-3.1_p23.ebuild +++ b/app-shells/bash/bash-3.1_p23.ebuild @@ -39,6 +39,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"; fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-2" SLOT="${MY_PV}" KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86" @@ -51,8 +53,6 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" -S="${WORKDIR}/${MY_P}" - PATCHES=( "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/autoconf-mktime-2.53.patch # bug #220040 "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-2.05b-parallel-build.patch # bug #41002 diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild index a037c31cc5bf..6e2c01156a99 100644 --- a/app-shells/bash/bash-3.2_p57.ebuild +++ b/app-shells/bash/bash-3.2_p57.ebuild @@ -39,6 +39,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"; fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-2" SLOT="${MY_PV}" KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86" @@ -51,8 +53,6 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" -S="${WORKDIR}/${MY_P}" - PATCHES=( "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/autoconf-mktime-2.59.patch # bug #220040 "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.2-loadables.patch diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild index 7b24d2dbfe79..0e4b7dc36654 100644 --- a/app-shells/bash/bash-4.0_p44.ebuild +++ b/app-shells/bash/bash-4.0_p44.ebuild @@ -39,6 +39,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"; fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-3" SLOT="${MY_PV}" KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86" @@ -51,8 +53,6 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" -S="${WORKDIR}/${MY_P}" - PATCHES=( "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.0-configure.patch # bug #304901 "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.x-deferred-heredocs.patch diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild index 75fc323afa2d..ef525196a304 100644 --- a/app-shells/bash/bash-4.1_p17.ebuild +++ b/app-shells/bash/bash-4.1_p17.ebuild @@ -39,6 +39,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"; fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-3" SLOT="${MY_PV}" KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86" @@ -51,8 +53,6 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" -S="${WORKDIR}/${MY_P}" - PATCHES=( "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.1-fbsd-eaccess.patch #bug #303411 diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild index a565b78649fa..0ec99efcdaf0 100644 --- a/app-shells/bash/bash-4.2_p53.ebuild +++ b/app-shells/bash/bash-4.2_p53.ebuild @@ -39,6 +39,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"; fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-3" SLOT="${MY_PV}" KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86" @@ -53,8 +55,6 @@ DEPEND="${RDEPEND} # We only need bison (yacc) when the .y files get patched (bash42-005) BDEPEND="sys-devel/bison" -S="${WORKDIR}/${MY_P}" - PATCHES=( "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.2-execute-job-control.patch # bug #383237 "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.2-parallel-build.patch diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild index cb9ed635ae01..dce3f7fbff7b 100644 --- a/app-shells/bash/bash-4.3_p48-r2.ebuild +++ b/app-shells/bash/bash-4.3_p48-r2.ebuild @@ -43,6 +43,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"; fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-3" SLOT="${MY_PV}" KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86" @@ -63,8 +65,6 @@ PATCHES=( "${WORKDIR}"/${P}-r2-patches/${PN}-4.4-popd-offset-overflow.patch # bug #600174 ) -S="${WORKDIR}/${MY_P}" - pkg_setup() { # bug #7332 if is-flag -malign-double ; then diff --git a/app-shells/bash/bash-4.4_p23-r2.ebuild b/app-shells/bash/bash-4.4_p23-r2.ebuild index 0611f83b57a0..0c4d3c66f06e 100644 --- a/app-shells/bash/bash-4.4_p23-r2.ebuild +++ b/app-shells/bash/bash-4.4_p23-r2.ebuild @@ -52,6 +52,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"; fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-3" SLOT="${MY_PV}" KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" @@ -68,8 +70,6 @@ RDEPEND=" # We only need bison (yacc) when the .y files get patched (bash42-005) #BDEPEND="sys-devel/bison" -S="${WORKDIR}/${MY_P}" - pkg_setup() { # bug #7332 if is-flag -malign-double ; then diff --git a/app-shells/bash/bash-5.0_p18-r3.ebuild b/app-shells/bash/bash-5.0_p18-r3.ebuild index 591365b1eb41..bde53d1bb063 100644 --- a/app-shells/bash/bash-5.0_p18-r3.ebuild +++ b/app-shells/bash/bash-5.0_p18-r3.ebuild @@ -52,6 +52,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"; fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-3" SLOT="${MY_PV}" KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" @@ -68,8 +70,6 @@ RDEPEND=" # We only need bison (yacc) when the .y files get patched (bash42-005) BDEPEND="sys-devel/bison" -S="${WORKDIR}/${MY_P}" - PATCHES=( # Patches from Chet sent to bashbug ml "${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-history-append.patch
