diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/Manifest index 8bae0ae91b..beb8591d6e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/Manifest @@ -1,3 +1 @@ -DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345b36234fcfcae1da98bc1c80a8450bc569c2ea2f4b1c3a852de2fe24413fe397d4a60a0ca94eb70a9626871f4bb SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde -DIST lsb-release-3.2.tar.gz 16246 BLAKE2B f790b52c403ff42ec1bf787100c6c9715b7bebf3feb1772a6c4caee40b09c121ba7522553d145c478c752b196109747e31b2d8c14764c67c4a7e57fbae06348d SHA512 5ccc2f38c3603b8261310d5f30d8304a95bd6c24fbbf00484609078839a68894b2ba761a7465fc3c22f55dd69d67612d3cc4cb453765e3eea6b9af96834d85fd DIST lsb-release-3.3.tar.gz 16364 BLAKE2B 91b53df571ebebae67ea2fc5f1f31a11a42166d4a584f5a236cee2a108e965d02b676c7be175239b616e42bc454bcff86485896191522ce5d0c7744f7178a636 SHA512 123291295000d4ce827c692a9ab5ebe300a61cb1dabf9af8bfffdd5f20363159e61a98670aac37ae087aa3639b4ec7dfdb5528aa8c3520f43225e9eae50270db diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/files/lsb-release-1.4-os-release.patch b/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/files/lsb-release-1.4-os-release.patch deleted file mode 100644 index 830726074c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/files/lsb-release-1.4-os-release.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/lsb_release -+++ b/lsb_release -@@ -250,6 +250,7 @@ - CHECKFIRST=$(find $INFO_ROOT/ -maxdepth 1 \ - -name \*$INFO_DISTRIB_SUFFIX \ - -and ! -name $INFO_LSB_FILE \ -+ -and ! -name os-release \ - -and -type f \ - 2>/dev/null \ - | head -1 ) # keep one of the files found (if many) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/lsb-release-1.4-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/lsb-release-1.4-r4.ebuild deleted file mode 100644 index 23951c0b8c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/lsb-release-1.4-r4.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit prefix - -DESCRIPTION="LSB version query program" -HOMEPAGE="https://wiki.linuxfoundation.org/lsb/" -SRC_URI="https://downloads.sourceforge.net/lsb/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" - -# Perl isn't needed at runtime, it is just used to generate the man page. -BDEPEND="dev-lang/perl" - -PATCHES=( - "${FILESDIR}"/${P}-os-release.patch # bug 443116 -) - -src_prepare() { - default - - # use POSIX 'printf' instead of bash 'echo -e', bug #482370 - sed -i \ - -e "s:echo -e:printf '%b\\\n':g" \ - -e 's:--long:-l:g' \ - lsb_release || die - - hprefixify lsb_release -} - -src_install() { - emake \ - prefix="${ED}/usr" \ - mandir="${ED}/usr/share/man" \ - install - - # installs gz compressed manpage, https://bugs.gentoo.org/729140 - rm "${ED}/usr/share/man/man1/lsb_release.1.gz" || die - gunzip lsb_release.1.gz - doman lsb_release.1 - - dodir /etc - cat > "${ED}/etc/lsb-release" <<- EOF || die - DISTRIB_ID="Gentoo" - EOF -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/lsb-release-3.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/lsb-release-3.2.ebuild deleted file mode 100644 index 1dda04ad9a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/lsb-release-3.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit prefix - -DESCRIPTION="LSB version query program" -HOMEPAGE="https://wiki.linuxfoundation.org/lsb/" -# https://downloads.sourceforge.net/lsb/${P}.tar.gz -SRC_URI="https://github.com/thkukuk/lsb-release_os-release/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/${PN}_os-release-${PV} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" - -# Perl isn't needed at runtime, it is just used to generate the man page. -BDEPEND="dev-lang/perl" - -src_prepare() { - default - - # Use POSIX 'printf' instead of bash 'echo -e', bug #482370 - sed -i \ - -e "s:echo -e:printf '%b\\\n':g" \ - -e 's:--long:-l:g' \ - lsb_release || die - - # TODO: unbundle help2man? - hprefixify lsb_release help2man -} - -src_install() { - emake prefix="${ED}"/usr install - - dodir /etc - cat > "${ED}"/etc/lsb-release <<- EOF || die - DISTRIB_ID="Gentoo" - EOF -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/lsb-release-3.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/lsb-release-3.3.ebuild index 8ca777f5dc..f7ba34253f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/lsb-release-3.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/lsb-release/lsb-release-3.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit prefix +inherit branding prefix DESCRIPTION="LSB version query program" HOMEPAGE="https://wiki.linuxfoundation.org/lsb/" @@ -34,6 +34,6 @@ src_install() { insinto /etc newins - lsb-release <<-EOF - DISTRIB_ID="Gentoo" + DISTRIB_ID="${BRANDING_OS_NAME// }" EOF }