6 files changed, 38 insertions, 88 deletions
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index 5f53670c9ddd..520e87a459c9 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,3 +1 @@
-DIST ncompress-4.2.4.5.tar.gz 35562 BLAKE2B a09661659a72cf4be40e143d8cff53779de7423c0337d8c92863509390d8adc355d660da98db9de431bb4c990f8d10955e19a97188b100450ff9ea2caf19ae8d SHA512 487e8d5ca743c3aba19cf69f7ec62bdc0784e43af5737f06d6d4257f2f33899eb3d293ed049f57b3164e344a0fddc077bc73437564977bad8de45816354c8bf3
-DIST ncompress-4.2.4.6.tar.gz 36006 BLAKE2B 1460fe803ed621e5e6e5ab506d8909acbfb1d3b91421cf7c7bc10b6b03b0cb6bb4ea616240a7aa500813d5fbf0a958e1e981da8a5f752d985ddcbf7fe9280d9c SHA512 03dd9670c48548d6f7a028dd307758ce7ac61997297c1075d65457ac849e8f2d710bc38fa9eb42e4b2cac163c1b93b7cf7eb197e90cbd689a1274df3de2a3ed8
 DIST ncompress-5.0.tar.gz 34185 BLAKE2B 7b296bd00024bfb483d3261ff8aa6e47a6be8c62b445c3d456d702b69fbc2a7b731326f7ea91aa331ba8e8a27936f4318b3e252cc978b6bf3198e8812988913f SHA512 5bc886f98f25b03d034e8d8ebb0ee9388d727ee3e0c6d8a906698b2f8fa5c930f55d857486244b7f40447c7b74f3c620626600db619d0c6d6fd434f52912be42
diff --git a/app-arch/ncompress/metadata.xml b/app-arch/ncompress/metadata.xml
index 0d4bcdec12c1..f8e16dcb5488 100644
--- a/app-arch/ncompress/metadata.xml
+++ b/app-arch/ncompress/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
diff --git a/app-arch/ncompress/ncompress-4.2.4.5.ebuild b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
deleted file mode 100644
index 6e674e404fac..000000000000
--- a/app-arch/ncompress/ncompress-4.2.4.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Classic compress & uncompress programs for .Z (LZW) files"
-HOMEPAGE="https://github.com/vapier/ncompress"
-SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin compress
-	dosym compress /usr/bin/uncompress
-	doman compress.1 uncompress.1
-	dodoc Acknowleds Changes LZW.INFO README.md
-}
diff --git a/app-arch/ncompress/ncompress-4.2.4.6.ebuild b/app-arch/ncompress/ncompress-4.2.4.6.ebuild
deleted file mode 100644
index b6a8705dfcee..000000000000
--- a/app-arch/ncompress/ncompress-4.2.4.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Classic compress & uncompress programs for .Z (LZW) files"
-HOMEPAGE="https://vapier.github.io/ncompress/"
-SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
-	default
-	sed -i 's:\bln :ln -s :' Makefile.def || die
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake install_core DESTDIR="${ED}" PREFIX="/usr"
-	dodoc Acknowleds Changes LZW.INFO README.md
-}
diff --git a/app-arch/ncompress/ncompress-5.0-r1.ebuild b/app-arch/ncompress/ncompress-5.0-r1.ebuild
new file mode 100644
index 000000000000..aad48b1bec95
--- /dev/null
+++ b/app-arch/ncompress/ncompress-5.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Classic compress & uncompress programs for .Z (LZW) files"
+HOMEPAGE="https://vapier.github.io/ncompress/"
+SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+src_prepare() {
+	default
+	# First sed expression replaces hardlinking with
+	# symlinking. Second sed expression fixes the symlink target
+	# to use relative path to a file in the same directory as the
+	# symlink (so point to compress instead of
+	# $(DESTDIR)$(BINDIR)/compress).
+	sed -i \
+		-e 's:\bln :ln -s :' \
+		-e 's:\(\bln [^$]*\)\$(DESTDIR)\$(BINDIR)/:\1:' \
+		Makefile.def || die
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	emake install_core DESTDIR="${ED}" PREFIX="/usr"
+	dodoc Acknowleds Changes LZW.INFO README.md
+}
diff --git a/app-arch/ncompress/ncompress-5.0.ebuild b/app-arch/ncompress/ncompress-5.0.ebuild
deleted file mode 100644
index f98381e6801c..000000000000
--- a/app-arch/ncompress/ncompress-5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Classic compress & uncompress programs for .Z (LZW) files"
-HOMEPAGE="https://vapier.github.io/ncompress/"
-SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
-	default
-	sed -i 's:\bln :ln -s :' Makefile.def || die
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake install_core DESTDIR="${ED}" PREFIX="/usr"
-	dodoc Acknowleds Changes LZW.INFO README.md
-}