4 files changed, 44 insertions, 53 deletions
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index 8d236b29..2f2f1ed7 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -1 +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
diff --git a/sys-apps/lsb-release/files/lsb-release-redcore-version.patch b/sys-apps/lsb-release/files/lsb-release-redcore-version.patch
deleted file mode 100644
index 0f40ca5f..00000000
--- a/sys-apps/lsb-release/files/lsb-release-redcore-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nurp lsb-release-1.4.orig/lsb_release lsb-release-1.4/lsb_release
---- lsb-release-1.4.orig/lsb_release	2000-12-15 08:19:16.000000000 +0100
-+++ lsb-release-1.4/lsb_release	2013-02-07 13:57:00.085819790 +0100
-@@ -47,7 +47,7 @@ INFO_LSB_FILE="lsb-release"
- INFO_DISTRIB_SUFFIX="release"                 # <distrib>-<suffix>
- ALTERNATE_DISTRIB_FILE="/etc/debian_version"  # for Debian [based distrib]
- ALTERNATE_DISTRIB_NAME="Debian"               #     "
--CHECKFIRST="/etc/redhat-release"              # check it before file search
-+CHECKFIRST="/etc/redcore-release"              # check it before file search
- 
- # Defines our exit codes
- EXIT_STATUS="0"                           # default = Ok :)
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r12.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r12.ebuild
deleted file mode 100644
index c7ed429e..00000000
--- a/sys-apps/lsb-release/lsb-release-1.4-r12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Sabayon
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-inherit eutils
-
-DESCRIPTION="LSB version query program"
-HOMEPAGE="http://www.linuxbase.org/"
-SRC_URI="mirror://sourceforge/lsb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-# Perl isn't needed at runtime, it is just used to generate the man page.
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-redcore-version.patch
-)
-
-src_install() {
-	emake \
-		prefix="${D}/usr" \
-		mandir="${D}/usr/share/man" \
-		install \
-		|| die "emake install failed"
-
-	mkdir -p "${D}/etc"
-	cat > "${D}/etc/lsb-release" <<- EOF
-		DISTRIB_ID="Redcore"
-		DISTRIB_RELEASE="2102"
-		DISTRIB_CODENAME="Polaris"
-		DISTRIB_DESCRIPTION="Redcore Linux Hardened 2102 - Polaris"
-	EOF
-}
diff --git a/sys-apps/lsb-release/lsb-release-3.2-r1.ebuild b/sys-apps/lsb-release/lsb-release-3.2-r1.ebuild
new file mode 100644
index 00000000..785bb114
--- /dev/null
+++ b/sys-apps/lsb-release/lsb-release-3.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 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/"
+# mirror://sourceforge/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 ~ia64 ~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 > "${D}/etc/lsb-release" <<- EOF
+		DISTRIB_ID="Redcore"
+		DISTRIB_RELEASE="rolling"
+		DISTRIB_DESCRIPTION="Redcore Linux Hardened - rolling"
+	EOF
+}