From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 19857158089 for ; Tue, 24 Oct 2023 18:37:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 171E92BC013; Tue, 24 Oct 2023 18:37:32 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 008222BC013 for ; Tue, 24 Oct 2023 18:37:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29D45335D0D for ; Tue, 24 Oct 2023 18:37:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87E7812BC for ; Tue, 24 Oct 2023 18:37:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1698172488.755c12b726acdb1b350ee24608b43d8f36eafdd1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/unrar/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/unrar/unrar-6.2.12-r1.ebuild X-VCS-Directories: app-arch/unrar/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 755c12b726acdb1b350ee24608b43d8f36eafdd1 X-VCS-Branch: master Date: Tue, 24 Oct 2023 18:37:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8c742d4c-f8ab-4d22-9f51-0783e6206bba X-Archives-Hash: a826051882fef8302d7345f89d5ba794 commit: 755c12b726acdb1b350ee24608b43d8f36eafdd1 Author: Eli Schwartz gmail com> AuthorDate: Mon Oct 23 03:31:40 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Oct 24 18:34:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=755c12b7 app-arch/unrar: fix symlinked header shenanigans UnRar is horrible proprietary Windows-oriented software, yes yes yes we know. It's nonstandard and the build system is a mess. It doesn't version the library soname, doesn't install headers, doesn't uninstall the files it installs, etc. Every distributor of it hacks around this differently, but there are a couple things that it would be good to be consistent with. In particular, a stable name is needed for: - including the header - passing link args to the compiler The latter works fine, but the former does not. There's a rough consensus to use "unrar/" to install headers, and other projects rely on that (or fall back to "libunrar/"), but we do not install there, and the place we do install to is not used even in ::gentoo. Start installing to "unrar/" instead. This allows some software to work that formerly did not, and should still work everywhere else that was looking for "libunrar/" as that is kept as a compat symlink. Closes: https://bugs.gentoo.org/916036 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> app-arch/unrar/unrar-6.2.12-r1.ebuild | 79 +++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) 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..bb14028fb165 --- /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 +}