11 files changed, 266 insertions, 151 deletions
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 57e0194c4ab7..460f0cf5c907 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,3 +1,5 @@
-DIST unrar-5.9.2.tar.gz 229900 BLAKE2B a941ef6566a5b58990d88e6e99cc23c169fd7d99fe2c8ef1313db860f9f220510ea002990740c4b3a3f980c037f9b3be4cdad84624a9a6f5094b1074721800d4 SHA512 e48dd3327d57522aa676e8fd6e29b7133ee9921eb1525d90ddedc61716ecfeefb51a7eb3a667f4f81f21a5ce8654727617d33463a5b6a40a7bc32252fa9f25df
-DIST unrar-5.9.3.tar.gz 229917 BLAKE2B 6ab2141970535753197d3ed74521f80d3b20ecc2a0f620932c31bd1b5ce4c70bc3e2671fed0a9a77ceb4f42f6423d315f3eac0a00dac334ee2c3dd60a569c78a SHA512 38b2e2e527a4d2df627072acb4c205f46c96771969db4558be04adf9166502b3b9c3d1cc60fe290b6c4ce56db68bb5e0b0ac3bf0698d9820d4840d56cc5f3e2f
-DIST unrar-5.9.4.tar.gz 229921 BLAKE2B d87189a6b6b3566a0efac7f72e40732ff673cdcac6f4fdaa96b5a771025f02779d74e2822053681477b3490f45817196673aa5707846767c4061ca95718557a1 SHA512 4c026bc12c38314c7df6e1b2f296be681fffa4ba525e378809063519cb5d51889fe8d3cbce16e802023354f02b45b1bcc672b79a6fa81b4baa13a374ce22c8f1
+DIST unrar-6.2.10.tar.gz 246383 BLAKE2B 6f7e7bf099f5a9de71c01b941c4cceaaf568709ac8b8e2f490f2f037c27adabc3bcde595e1330476f72204e6c5611e8c995c4c2842d9248731d876e67abc1086 SHA512 26e7febc4e62bcace7aa36e05d5341ab57813cc0c224c6a924ca909828879b0172d2cea9ab6cfdfe4bc3b51d49feb48f46df3874fa6f070f6062a15e1020271d
+DIST unrar-6.2.12.tar.gz 246918 BLAKE2B 3c7744ee5839b4d87362625a03f30e3cac3d74df988479692023b9c242c136044666ebf0470197b28b95171dae076faecf815ef50caffb747185b8433707612c SHA512 261ac3728f917f36a03c7c3c563d7775abdb06b598ab48a299d837e8fc0ca75ad885ec8e292aeb1775e87e775ed274e9e0f033001598229ec96db69d69824ddb
+DIST unrar-6.2.8.tar.gz 246249 BLAKE2B 3766f7ebd0379835cff7cce8bb2deaf86d3de7c4a37d211d8a41effeb13a5a9efc53deabb5f10cd7f49d8e144cd9c1a93cce2ca3ae74e8a2142ab3ae97ab4759 SHA512 9b956d0c4b6a13f9ff4d9e57de7284dc879070746e3792e7640481a5b5b8336142b21c4d0c66c64627630cafbed0ff019a41b8f8536299ac7cbfdb933f92f75a
+DIST unrar-6.2.9.tar.gz 246388 BLAKE2B 495af1b78d2213c6bac0e75462b3d5e9fc3bfea809bcbb672216da47cd483bcc5867b504358125c51147a0e1869568c8a822946ca8148f204eeb087671029d9d SHA512 80424348946a56b47c107b2cd78c8bc7ce7f223a4d923b137860ec50678c4f279114dd7cdc9eb6a2fa6ff8c8a059ab8d35e16e3feae9dd1433fe51479501b61c
+DIST unrar-7.0.7.tar.gz 258219 BLAKE2B 06897428ef6ae9b2e6ef3183f25c06447386c7b5ce1c1438ad0119507ccbd2f2b62ce9d45c4dc73241db4440a1f96c7d9a9f3f542c0a7967df9c08b8cd3141cb SHA512 7151a42742d4c34a8f03c58dae471f80788b76adbb52188759b7fc7357757f88fa9d980de006ce48732c40f326b92b79fb069e807c2b66d4387ee60433a8accb
diff --git a/app-arch/unrar/files/unrar-5.5.5-build.patch b/app-arch/unrar/files/unrar-5.5.5-build.patch
deleted file mode 100644
index 5d69a25d65af..000000000000
--- a/app-arch/unrar/files/unrar-5.5.5-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Makefile: Fix parallel build issue
-
-If clean runs in parallel with $(OBJECTS), it is possible to build some
-objects first, then the clean target fires and deletes some, and then we
-try to link and fail.
-
-Gentoo-Bug: https://bugs.gentoo.org/528218
-
---- a/makefile
-+++ b/makefile
-@@ -139,23 +139,23 @@ uninstall:	uninstall-unrar
- 
- clean:
- 	@rm -f *.o *.bak *~
--
--unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
- 	@rm -f unrar
-+	@rm -f default.sfx
-+	@rm -f libunrar.so
-+	@rm -f libunrar.a
-+
-+unrar:	$(OBJECTS) $(UNRAR_OBJ)
- 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
- 	$(STRIP) unrar
- 
- sfx:	WHAT=SFX_MODULE
--sfx:	clean $(OBJECTS)
--	@rm -f default.sfx
-+sfx:	$(OBJECTS)
- 	$(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS)
- 	$(STRIP) default.sfx
- 
- lib:	WHAT=RARDLL
- lib:	CXXFLAGS+=$(LIBFLAGS)
--lib:	clean $(OBJECTS) $(LIB_OBJ)
--	@rm -f libunrar.so
--	@rm -f libunrar.a
-+lib:	$(OBJECTS) $(LIB_OBJ)
- 	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
- 	$(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
- 
--- 
-2.13.1
-
diff --git a/app-arch/unrar/files/unrar-5.9.3-build.patch b/app-arch/unrar/files/unrar-5.9.3-build.patch
deleted file mode 100644
index d9cbcfd8683a..000000000000
--- a/app-arch/unrar/files/unrar-5.9.3-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Makefile: Fix parallel build issue
-
-If clean runs in parallel with $(OBJECTS), it is possible to build some
-objects first, then the clean target fires and deletes some, and then we
-try to link and fail.
-
-Gentoo-Bug: https://bugs.gentoo.org/528218
-
---- unrar/makefile
-+++ unrar/makefile
-@@ -142,21 +142,18 @@
- 	@rm -f $(OBJECTS) $(UNRAR_OBJ) $(LIB_OBJ)
- 	@rm -f unrar libunrar.*
- 
--unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
--	@rm -f unrar
-+unrar:	$(OBJECTS) $(UNRAR_OBJ)
- 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
- 	$(STRIP) unrar
- 
- sfx:	WHAT=SFX_MODULE
--sfx:	clean $(OBJECTS)
--	@rm -f default.sfx
-+sfx:	$(OBJECTS)
- 	$(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS)
- 	$(STRIP) default.sfx
- 
- lib:	WHAT=RARDLL
- lib:	CXXFLAGS+=$(LIBFLAGS)
--lib:	clean $(OBJECTS) $(LIB_OBJ)
--	@rm -f libunrar.*
-+lib:	$(OBJECTS) $(LIB_OBJ)
- 	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
- 	$(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
- 
diff --git a/app-arch/unrar/files/unrar-5.5.5-honor-flags.patch b/app-arch/unrar/files/unrar-6.2.6-honor-flags.patch
index 0237e3d30f05..976f1417c861 100644
--- a/app-arch/unrar/files/unrar-5.5.5-honor-flags.patch
+++ b/app-arch/unrar/files/unrar-6.2.6-honor-flags.patch
@@ -17,30 +17,30 @@ Gentoo-Bug: https://bugs.gentoo.org/461806
  DESTDIR=/usr
  
  # Linux using LCC
-@@ -145,18 +145,19 @@ clean:
- 	@rm -f libunrar.a
+@@ -147,20 +147,21 @@ clean:
  
  unrar:	$(OBJECTS) $(UNRAR_OBJ)
+ 	@rm -f unrar
 -	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
 +	$(LINK) -o unrar $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)
  	$(STRIP) unrar
  
  sfx:	WHAT=SFX_MODULE
  sfx:	$(OBJECTS)
+ 	@rm -f default.sfx
 -	$(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS)
 +	$(LINK) -o default.sfx $(CXXFLAGS) $(LDFLAGS) $(OBJECTS)
  	$(STRIP) default.sfx
  
-+$(OBJECTS) $(LIB_OBJ):	CXXFLAGS+=$(LIBFLAGS)
++$(OBJECTS) $(LIB_OBJ): CXXFLAGS+=$(LIBFLAGS)
 +
  lib:	WHAT=RARDLL
 -lib:	CXXFLAGS+=$(LIBFLAGS)
  lib:	$(OBJECTS) $(LIB_OBJ)
+ 	@rm -f libunrar.*
 -	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
 +	$(LINK) -shared -o libunrar.so $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
  	$(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
  
  install-unrar:
--- 
-2.13.1
-
+--
diff --git a/app-arch/unrar/metadata.xml b/app-arch/unrar/metadata.xml
index 08898384e738..29bcd146892a 100644
--- a/app-arch/unrar/metadata.xml
+++ b/app-arch/unrar/metadata.xml
@@ -1,18 +1,14 @@
 <?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="person">
-  <email>whissi@gentoo.org</email>
-  <name>Thomas Deutschmann</name>
-</maintainer>
-<maintainer type="project">
-  <email>base-system@gentoo.org</email>
-  <name>Gentoo Base System</name>
-</maintainer>
-<slots>
-  <subslots>Reflect ABI of libunrar.so.</subslots>
-</slots>
-<upstream>
-  <remote-id type="cpe">cpe:/a:rarlab:unrar</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<slots>
+		<subslots>Reflect ABI of libunrar.so.</subslots>
+	</slots>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:rarlab:unrar</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/unrar/unrar-5.9.2.ebuild b/app-arch/unrar/unrar-6.2.10.ebuild
index 9496c0025dae..64caffbf3b3a 100644
--- a/app-arch/unrar/unrar-5.9.2.ebuild
+++ b/app-arch/unrar/unrar-6.2.10.ebuild
@@ -1,30 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit multilib toolchain-funcs
 
 MY_PN="${PN}src"
 
 DESCRIPTION="Uncompress rar files"
 HOMEPAGE="https://www.rarlab.com/rar_add.htm"
 SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
 
 LICENSE="unRAR"
-# subslot = soname version
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S="${WORKDIR}/unrar"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.5.5-build.patch
-	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
+PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
 
 src_prepare() {
 	default
@@ -39,7 +31,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mkdir -p build-{lib,bin}
+	mkdir -p build-{lib,bin} || die
 	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
 	cp build-{lib,bin}/Makefile || die
 }
diff --git a/app-arch/unrar/unrar-6.2.12-r1.ebuild b/app-arch/unrar/unrar-6.2.12-r1.ebuild
new file mode 100644
index 000000000000..66957ceed24c
--- /dev/null
+++ b/app-arch/unrar/unrar-6.2.12-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
+
+LICENSE="unRAR"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	# unrar doesn't officially install headers, but unofficially, software
+	# depends on it anyway. There is no standard for where to install them,
+	# but the most common location (shared by nearly all vendors) is "unrar".
+	# FreeBSD alone uses "libunrar". Gentoo formerly used "libunrar6" and
+	# had a compat symlink for FreeBSD, then passed the compat location in
+	# ./configure scripts e.g. for sys-fs/rar2fs. Software in the wild
+	# seems to expect either "unrar" or "libunrar".
+	# See: https://bugs.gentoo.org/916036
+	#
+	# We now use the "standard" (hah) location, and keep the compat symlink but
+	# change the destination. The version-suffixed location lacks utility, but
+	# we would keep it if we could, just in case -- unfortunately portage is
+	# buggy: https://bugs.gentoo.org/834600
+	#
+	# Hopefully, no one has ever actually used it and therefore this does not
+	# matter. The odds are on our side, since it periodically changed location
+	# arbitrarily.
+	insinto /usr/include/unrar
+	doins *.hpp
+	dosym unrar /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
diff --git a/app-arch/unrar/unrar-5.9.4.ebuild b/app-arch/unrar/unrar-6.2.12.ebuild
index 7a4b90b3f3b7..c97982261acd 100644
--- a/app-arch/unrar/unrar-5.9.4.ebuild
+++ b/app-arch/unrar/unrar-6.2.12.ebuild
@@ -1,30 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit multilib toolchain-funcs
 
 MY_PN="${PN}src"
 
 DESCRIPTION="Uncompress rar files"
 HOMEPAGE="https://www.rarlab.com/rar_add.htm"
 SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
 
 LICENSE="unRAR"
-# subslot = soname version
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S="${WORKDIR}/unrar"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.3-build.patch
-	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
+PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
 
 src_prepare() {
 	default
@@ -39,7 +31,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mkdir -p build-{lib,bin}
+	mkdir -p build-{lib,bin} || die
 	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
 	cp build-{lib,bin}/Makefile || die
 }
diff --git a/app-arch/unrar/unrar-5.9.3.ebuild b/app-arch/unrar/unrar-6.2.8.ebuild
index 7a4b90b3f3b7..64caffbf3b3a 100644
--- a/app-arch/unrar/unrar-5.9.3.ebuild
+++ b/app-arch/unrar/unrar-6.2.8.ebuild
@@ -1,30 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit multilib toolchain-funcs
 
 MY_PN="${PN}src"
 
 DESCRIPTION="Uncompress rar files"
 HOMEPAGE="https://www.rarlab.com/rar_add.htm"
 SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
 
 LICENSE="unRAR"
-# subslot = soname version
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S="${WORKDIR}/unrar"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.3-build.patch
-	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
+PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
 
 src_prepare() {
 	default
@@ -39,7 +31,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mkdir -p build-{lib,bin}
+	mkdir -p build-{lib,bin} || die
 	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
 	cp build-{lib,bin}/Makefile || die
 }
diff --git a/app-arch/unrar/unrar-6.2.9.ebuild b/app-arch/unrar/unrar-6.2.9.ebuild
new file mode 100644
index 000000000000..c97982261acd
--- /dev/null
+++ b/app-arch/unrar/unrar-6.2.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
+
+LICENSE="unRAR"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
diff --git a/app-arch/unrar/unrar-7.0.7.ebuild b/app-arch/unrar/unrar-7.0.7.ebuild
new file mode 100644
index 000000000000..dcc656ed9f4f
--- /dev/null
+++ b/app-arch/unrar/unrar-7.0.7.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
+
+LICENSE="unRAR"
+SLOT="0/7" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	# unrar doesn't officially install headers, but unofficially, software
+	# depends on it anyway. There is no standard for where to install them,
+	# but the most common location (shared by nearly all vendors) is "unrar".
+	# FreeBSD alone uses "libunrar". Gentoo formerly used "libunrar6" and
+	# had a compat symlink for FreeBSD, then passed the compat location in
+	# ./configure scripts e.g. for sys-fs/rar2fs. Software in the wild
+	# seems to expect either "unrar" or "libunrar".
+	# See: https://bugs.gentoo.org/916036
+	#
+	# We now use the "standard" (hah) location, and keep the compat symlink but
+	# change the destination. The version-suffixed location lacks utility, but
+	# we would keep it if we could, just in case -- unfortunately portage is
+	# buggy: https://bugs.gentoo.org/834600
+	#
+	# Hopefully, no one has ever actually used it and therefore this does not
+	# matter. The odds are on our side, since it periodically changed location
+	# arbitrarily.
+	insinto /usr/include/unrar
+	doins *.hpp
+	dosym unrar /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}