From 2f587621abe13a629022e31949a22a08dad70530 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <jlecuirot@microsoft.com>
Date: Thu, 24 Apr 2025 11:49:26 +0100
Subject: [PATCH] dev-util/checkbashisms: Drop package as qemu script now uses
 Bash

The check for that script was the only consumer.

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
---
 .../workflows/portage-stable-packages-list    |  4 ---
 build_library/vm_image_util.sh                |  1 -
 ...55.ebuild => sdk-depends-0.0.1-r56.ebuild} |  0
 .../sdk-depends/sdk-depends-0.0.1.ebuild      |  1 -
 .../dev-util/checkbashisms/Manifest           |  2 --
 .../checkbashisms/checkbashisms-2.22.2.ebuild | 35 -------------------
 .../checkbashisms/checkbashisms-2.23.5.ebuild | 35 -------------------
 .../dev-util/checkbashisms/metadata.xml       | 14 --------
 .../Getopt-Long/Getopt-Long-2.580.0.ebuild    | 14 --------
 .../perl-core/Getopt-Long/Manifest            |  1 -
 .../perl-core/Getopt-Long/metadata.xml        | 14 --------
 .../virtual/perl-Getopt-Long/metadata.xml     |  9 -----
 .../perl-Getopt-Long-2.570.0-r1.ebuild        | 15 --------
 .../perl-Getopt-Long-2.580.0.ebuild           | 15 --------
 14 files changed, 160 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/{sdk-depends-0.0.1-r55.ebuild => sdk-depends-0.0.1-r56.ebuild} (100%)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/Manifest
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.22.2.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.23.5.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/metadata.xml
 delete mode 100644 sdk_container/src/third_party/portage-stable/perl-core/Getopt-Long/Getopt-Long-2.580.0.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/perl-core/Getopt-Long/Manifest
 delete mode 100644 sdk_container/src/third_party/portage-stable/perl-core/Getopt-Long/metadata.xml
 delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/metadata.xml
 delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.570.0-r1.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.580.0.ebuild

diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list
index 0842bae55f..d1e46114fa 100644
--- a/.github/workflows/portage-stable-packages-list
+++ b/.github/workflows/portage-stable-packages-list
@@ -353,7 +353,6 @@ dev-python/wheel
 
 dev-util/bpftool
 dev-util/catalyst
-dev-util/checkbashisms
 dev-util/gdbus-codegen
 dev-util/glib-utils
 dev-util/gperf
@@ -538,8 +537,6 @@ net-nds/rpcbind
 
 net-vpn/wireguard-tools
 
-perl-core/Getopt-Long
-
 profiles
 
 scripts
@@ -705,7 +702,6 @@ virtual/pager
 virtual/perl-Data-Dumper
 virtual/perl-Encode
 virtual/perl-ExtUtils-MakeMaker
-virtual/perl-Getopt-Long
 virtual/perl-Unicode-Collate
 virtual/pkgconfig
 virtual/resolvconf
diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 93772959eb..1a6950ea2f 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -794,7 +794,6 @@ _write_qemu_common() {
         -e "s%^VM_MEMORY=.*%VM_MEMORY='${vm_mem}'%" \
         -e "s%^VM_BOARD=.*%VM_BOARD='${BOARD}'%" \
         "${BUILD_LIBRARY_DIR}/qemu_template.sh" > "${script}"
-    checkbashisms --posix "${script}" || die
     chmod +x "${script}"
 
     cat >"${VM_README}" <<EOF
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r55.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r56.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r55.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r56.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
index 2fbf5f38a6..0d8be10a14 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
@@ -32,7 +32,6 @@ DEPEND="
 	dev-python/setuptools
 	dev-python/six
 	dev-util/catalyst
-	dev-util/checkbashisms
 	dev-util/pahole
 	dev-util/patchelf
 	net-dns/bind
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/Manifest
deleted file mode 100644
index ad44f7911b..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST devscripts_2.22.2.tar.xz 995524 BLAKE2B a7649ea5b790a64b5470a66425e487959b058e9af34be173210277765c8610f7d6da1b9105f97e1da2f84a578ca7514b1dabaa7c38a88c9b1eef29c2f34f97a1 SHA512 d6c47f604a252f58e1cf8ea9fe7387a390683757144bb76cce6915fca1ff7ccb71ce6c87d829f874097d869172774a806b506dc7fb4187876d14e50eaaf92593
-DIST devscripts_2.23.5.tar.xz 991592 BLAKE2B e5932d3d98f555b9585c4b9b3e0932c8ea56a572c474db1c27caa175de2af1c2d5ed9f1cd37bdc6eb4e886000c31d7389b2c1943a53091d2dcc75081959a277f SHA512 c1ca4d664ff03d4952f89612dfad9aa6ffd2a51ea90945d28a3b85ba8bc6d2be3e35d84339369e1fd4eb25e99a1d6773051e34cc93df83e3927ab6d53d61d393
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.22.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.22.2.ebuild
deleted file mode 100644
index 80c4ac6c7c..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.22.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-S="${WORKDIR}/${MY_P}/scripts"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-src_prepare() {
-	default
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.23.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.23.5.ebuild
deleted file mode 100644
index d5616440c4..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.23.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-S="${WORKDIR}/${MY_PN}/scripts"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-src_prepare() {
-	default
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/metadata.xml
deleted file mode 100644
index 28866513f7..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>base-system@gentoo.org</email>
-    <name>Gentoo Base System</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">checkbaskisms</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/perl-core/Getopt-Long/Getopt-Long-2.580.0.ebuild b/sdk_container/src/third_party/portage-stable/perl-core/Getopt-Long/Getopt-Long-2.580.0.ebuild
deleted file mode 100644
index 7f61b9e8c6..0000000000
--- a/sdk_container/src/third_party/portage-stable/perl-core/Getopt-Long/Getopt-Long-2.580.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=JV
-DIST_VERSION=2.58
-DIST_TEST=do
-inherit perl-module
-
-DESCRIPTION="Advanced handling of command line options"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
diff --git a/sdk_container/src/third_party/portage-stable/perl-core/Getopt-Long/Manifest b/sdk_container/src/third_party/portage-stable/perl-core/Getopt-Long/Manifest
deleted file mode 100644
index 5d02f6c873..0000000000
--- a/sdk_container/src/third_party/portage-stable/perl-core/Getopt-Long/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Getopt-Long-2.58.tar.gz 45642 BLAKE2B 3ecf9cb6c984128f3468d8f88e96baffa14d5b52ed90ce2e6298b231d3ff3bf5273c78fae7ae187d2eaceee98e6b14ce8a7d249c6b5298b5e511c8690f320659 SHA512 c673b82a819533310d5697be7e0b009ed39fd02873d17b3f0e1eebab790c58faf5e0a6b1d79bf274e3ee9d35d43b355988dccae56ec9fcbc6822bcae7d7e2ef6
diff --git a/sdk_container/src/third_party/portage-stable/perl-core/Getopt-Long/metadata.xml b/sdk_container/src/third_party/portage-stable/perl-core/Getopt-Long/metadata.xml
deleted file mode 100644
index 582824f4bb..0000000000
--- a/sdk_container/src/third_party/portage-stable/perl-core/Getopt-Long/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">Getopt-Long</remote-id>
-    <remote-id type="cpan-module">Getopt::Long</remote-id>
-    <remote-id type="cpan-module">Getopt::Long::CallBack</remote-id>
-    <remote-id type="cpan-module">Getopt::Long::Parser</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/metadata.xml
deleted file mode 100644
index 1a0d0fb9a8..0000000000
--- a/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.570.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.570.0-r1.ebuild
deleted file mode 100644
index 022f82abdd..0000000000
--- a/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.570.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.580.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.580.0.ebuild
deleted file mode 100644
index d5520a50a8..0000000000
--- a/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.580.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	~perl-core/${PN#perl-}-${PV}
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"