gentoo auto-resync : 16:04:2023 - 11:50:23

3 files changed, 111 insertions, 0 deletions

diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 5b1d7a3c5966..d7022f0ff3ba 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,11 +1,14 @@
 AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
 AUX unrar-5.9.3-build.patch 943 BLAKE2B 1f482772b491269413e11e600e049ed608ccb4b0b0271d43d3df43849cbcfe60a4fd4546fb5e69dbe95d6729b344f705b97483a5bc0c1d11edc21ce8e08bca6b SHA512 b6d3e5c6bf0e3605c3390b97bdd1f0747fff32eb7780a7ec967421841203a6cacb42ce16041bec84f88fa1eb2fd15b9235da1f37d517c9e7d876034a5bd79466
+AUX unrar-6.2.6-honor-flags.patch 1238 BLAKE2B 3006316800d6933f85935b0d1d4a224ae63d76d826c2a71f21ba148466d17e76e0a93f24d9c88015a8c58c4ca8f602ad25da48d097b80a078dbcc38a1a47715d SHA512 11cb495b661272b44078368318d2ec9f91e5d70bc79e5504c41a7d8e5207dc6b9afbad7cb36ac3188268f3797fa236bee55fcad8c95daeda2191a9e2a26dfd60
 DIST unrar-6.1.7.tar.gz 236798 BLAKE2B e33a7500b4a03a54f84b018ab90934366f52ef54c83257ed7fe4419ba993d2a8c21de26f445ae18d870aa5232cfbf1f5d8fbc0b3965803aeec6cac5e5a38e949 SHA512 b1a95358ff66b0e049597bbc4e1786d0bc909a8aff4aca94ee793d0d5a3c8b052eb347d88f44b6bc2e6231e777f1b711c198711118ae9ffbe8db2f72e7fbe846
 DIST unrar-6.2.1.tar.gz 242918 BLAKE2B 55cd5d11caae2e6cef2a36f5656b76d96946d6d7df3f34d7c65cc31b43b820d955da4751666797f8147c6a7b20c3429527b2b1629842334d3bec6de49e1d6a72 SHA512 920819b4b3e76004492813b4c22309443976fe5e7c873032bc084603b902c6873775cb90cb173d78de3624a3161a2238c9ece1e817f6b7d915937e2e18d8def9
 DIST unrar-6.2.3.tar.gz 245210 BLAKE2B 85dc22e52404a57286a19c901543aaeffd4526a2f7653f35b4d60c8c7c0965401f9b9658f79b1a06fc56365268a7c4895a560f04cff5d926fbc20ffa4f3d8f10 SHA512 070d027134210db930500f612bae41390af53d810160f8e5368640b6afee1a26650fc3473f8b563248b47ecc082dfd30b6fca318de6539c7795ac93af39f3357
 DIST unrar-6.2.5.tar.gz 245711 BLAKE2B 6cdb899ecb996184769eda11b113e8cdb39f89d6be9c3109fbb6b72a8778109db02c9a7b8451190c3eb994dbd3c628d7c8bdc6a9316aff0596d1a10d903d39f1 SHA512 0b85f085e3419d4d044c70a20abdd28f4528ffcf719703a30656ea906610cd5aa5826f57ef63e2db4e541a2f01c6c5504c19bc67319bf48c377784a30fb4b20e
+DIST unrar-6.2.6.tar.gz 246212 BLAKE2B f12e8d2f6935feb06321660bffacc11af2fc14f011872b5af35df80cf881f3d21c39f211100351ffe7cf0e2134f3a26d0e9a3b8160a3474866aa433e092c5851 SHA512 c2dc4176426dd73cfcbb3af135f8eb44ad455ea29e0e45b23e6987dd33658530444e35598fd5ffae0e27a466a9e01daf4b167edd69a686b62fd3b5a0f3bf81f6
 EBUILD unrar-6.1.7.ebuild 1826 BLAKE2B 8d1bf4e45161d4d98462c23876551bdf9770bce19a8907a6151c293fc92ba5a19595efed02d0f1308517f774cb28496d0c0fd9b9819adaf3eb409da4162d1cc0 SHA512 b326b0c8cec1c02ce8deca83f111da38f059f238b0592a99ad572dc347e0f51b6ab19ae6443fe93f15dcf9699c1cdeb8582e412130595456e19688aec0473def
 EBUILD unrar-6.2.1.ebuild 1826 BLAKE2B b449ec63a4ed696c256b7a4491650ffab88ef56f09cc101a31cbc7c70effe2561987e5c8029cc67c900bac9b556f2e3fa76de37352e8ae9795b93a38b8db1504 SHA512 638c07ad01e388dfb64132c9faa2512433a9aeae37385d065feafa1626a9a781454f6439ca3d2ce2db818375101fbb1800e7e609798b720eff2f913f63ee1707
 EBUILD unrar-6.2.3.ebuild 1826 BLAKE2B 080d4a4075a0d073dab090ea1b7dad6d903c6048789b10d95d887ecb2564acb486e5dd92fabfac8e724d96ac013a489fc302e04ce6e7041c5044c9418ee0a50e SHA512 8e16b483f9eca252fd485c102b6c79cb1c2e0b5adba35a9ec3af509a69a86e8279b5036cf68f63bdabc428e3589b1eced174febbedb6790402229ff183da42ad
 EBUILD unrar-6.2.5.ebuild 1826 BLAKE2B 080d4a4075a0d073dab090ea1b7dad6d903c6048789b10d95d887ecb2564acb486e5dd92fabfac8e724d96ac013a489fc302e04ce6e7041c5044c9418ee0a50e SHA512 8e16b483f9eca252fd485c102b6c79cb1c2e0b5adba35a9ec3af509a69a86e8279b5036cf68f63bdabc428e3589b1eced174febbedb6790402229ff183da42ad
+EBUILD unrar-6.2.6.ebuild 1785 BLAKE2B bdf816617c317e1166f318ff0ac8649f4840d505aba17fa2edef2aed8a1bbfe236bb08ab2ce1a01d4fdcd0f982c0de0a363cce9a67b217ca19f9b19b352a4f0a SHA512 0929b5f4f1560379a5d62c2bee2b75738aa43e7cf2db691b894667c60c2f72989cebbdbf6b7f3b9b5763d2f2748149fc8eb6a5b14695875157e4a78aa03c4c6a
 MISC metadata.xml 409 BLAKE2B a84cfacf4a852caa6f6389b380eeb700e1c44c4af68cb2568a27db21c2b577838d9c57269dcdb5f08dfa989617eca978520082d36153ea503a5033c4cc9446af SHA512 fcdf5a345b3eb2b5093b60def127dd48fed068bf5caa92dc52524b4e398d49c39d8ee686b3f0695c781ab2d0d3ba486baec23f74f80e581b7a2f77e0c5709eaa
diff --git a/app-arch/unrar/files/unrar-6.2.6-honor-flags.patch b/app-arch/unrar/files/unrar-6.2.6-honor-flags.patch
new file mode 100644
index 000000000000..976f1417c861
--- /dev/null
+++ b/app-arch/unrar/files/unrar-6.2.6-honor-flags.patch
@@ -0,0 +1,46 @@
+Makefile: Honor {LD,CXX}FLAGS, add LIBFLAGS
+
+ - append -pthread to LDFLAGS instead of replacing them
+ - use CXXFLAGS when linking
+ - append LIBFLAGS to the individual targets instead of the final link
+
+Gentoo-Bug: https://bugs.gentoo.org/461806
+
+--- a/makefile
++++ b/makefile
+@@ -8,7 +8,7 @@ LIBFLAGS=-fPIC
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
+ STRIP=strip
+ AR=ar
+-LDFLAGS=-pthread
++LDFLAGS+=-pthread
+ DESTDIR=/usr
+ 
+ # Linux using LCC
+@@ -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)
++
+ 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:
+--
diff --git a/app-arch/unrar/unrar-6.2.6.ebuild b/app-arch/unrar/unrar-6.2.6.ebuild
new file mode 100644
index 000000000000..cf009542889a
--- /dev/null
+++ b/app-arch/unrar/unrar-6.2.6.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 ~sparc-solaris ~x86-solaris"
+
+PATCHES=( "${FILESDIR}/${P}-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
+}