diff options
Diffstat (limited to 'app-arch')
33 files changed, 712 insertions, 671 deletions
diff --git a/app-arch/7zip/7zip-24.06.ebuild b/app-arch/7zip/7zip-24.06.ebuild new file mode 100644 index 000000000000..4c6458379962 --- /dev/null +++ b/app-arch/7zip/7zip-24.06.ebuild @@ -0,0 +1,109 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edos2unix flag-o-matic toolchain-funcs + +NO_DOT_PV=$(ver_rs 1- '') +DESCRIPTION="Free file archiver for extremely high compression" +HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/" +# linux-x64 tarball is only used for docs +SRC_URI=" + https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz + https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz +" +S="${WORKDIR}" + +LICENSE="LGPL-2 BSD rar? ( unRAR )" +SLOT="0" +KEYWORDS="~amd64" +IUSE="uasm jwasm rar" +REQUIRED_USE="?? ( uasm jwasm )" + +DOCS=( readme.txt History.txt License.txt ) +HTML_DOCS=( MANUAL ) + +DEPEND="${RDEPEND}" +BDEPEND=" + uasm? ( dev-lang/uasm ) + jwasm? ( dev-lang/jwasm ) +" + +PATCHES=( + "${FILESDIR}/${PN}-24.05-respect-build-env.patch" +) + +# TODO(NRK): also build and install the library +# TODO(NRK): make it so this package can be used as a drop-in replacement +# for app-arch/p7zip ?? + +pkg_setup() { + # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux + # TLDR; every combination of options (clang|gcc)+(asm/noasm) + # has a dedicated makefile & builddir + mfile="cmpl" + if tc-is-clang; then + mfile="${mfile}_clang" + bdir=c + elif tc-is-gcc; then + mfile="${mfile}_gcc" + bdir=g + else + die "Unsupported compiler: $(tc-getCC)" + fi + if use jwasm || use uasm ; then + mfile="${mfile}_x64" + bdir="${bdir}_x64" + fi + export mfile="${mfile}.mak" + export bdir +} + +src_prepare() { + # patch doesn't deal with CRLF even if file+patch match + # not even with --ignore-whitespace, --binary or --force + pushd "./CPP/7zip" || die "Unable to switch directory" + edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak + sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror" + popd >/dev/null || die "Unable to switch directory" + + default +} + +src_compile() { + pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory" + + # avoid executable stack when using uasm/jwasm, harmless otherwise + append-ldflags -Wl,-z,noexecstack + export G_CFLAGS=${CFLAGS} + export G_CXXFLAGS=${CXXFLAGS} + export G_LDFLAGS=${LDFLAGS} + + local args=( + -f "../../${mfile}" + CC=$(tc-getCC) + CXX=$(tc-getCXX) + ) + # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only + # whether it's defined or not. so in case user has `rar` enabled + # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined. + if ! use rar; then + # disables non-free rar code but allows listing and extracting + # non-compressed rar archives + args+=( DISABLE_RAR_COMPRESS=1 ) + fi + if use jwasm; then + args+=( USE_JWASM=1 ) + elif use uasm; then + args+=( MY_ASM=uasm ) + fi + + emake ${args[@]} + popd > /dev/null || die "Unable to switch directory" +} + +src_install() { + dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz" + einstalldocs +} diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest index 558db29a9ad6..d0f226033c4e 100644 --- a/app-arch/7zip/Manifest +++ b/app-arch/7zip/Manifest @@ -2,3 +2,5 @@ DIST 7z2301-linux-x64.tar.xz 1527700 BLAKE2B 35dc74f0a7a4e586ea5ae969dce72c14e02 DIST 7z2301-src.tar.xz 1378588 BLAKE2B 348484b24b39db70e513fe50d79954ea0e2dd669f83e3601fa796c8f0ca4734132ca20fac8cda9b8ba550bad9146627fc0ae07056abb99028ef6d825b6a533bd SHA512 e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986 DIST 7z2405-linux-x64.tar.xz 1553872 BLAKE2B d6c0bd4eb81f4112bfe50bf6affc68021b03d059076af5519a41c8d471e978ad2b4acc8f67c650070f9d07c518741a0146579ddfb8d56fd125f6db0beece0990 SHA512 13f97236157e2761a0bf406b08fba13a1ecc6d5663fb38f8dfe3b87f3910ba34fd359d8b36bea5135319543f31ec1e210eb512ea9864d9b140c336b9e416c313 DIST 7z2405-src.tar.xz 1486772 BLAKE2B 609c7ae8b89e56e747ebfecb25108d8918138f48f0f2ed73183c76101ddd3615aafb9eb7823be0de2a434b450587e01f476d2ed092628a311b6e4ed091e06260 SHA512 d340adfa68e818dd3d3aa411780c81532fa37b6649178b81ec3739725f83e0bc3c01744612b2d467f4d0c2cc984dd35488406d7baee185cf372acebd9c0123a7 +DIST 7z2406-linux-x64.tar.xz 1551724 BLAKE2B e4cc8141b074209b58018e6aeb4b91f140160d5d52e1fba59da2d0cfcd41c488cbfa4bda99bdedd4915ca3c3bcca50e7f7f4289f44ce120577c8b632d2f7bf07 SHA512 fce2b8e9f26f092209613dc058a267ddf24c474a80b7e9837014fdaeab53bb892b7181561ca90048ca593fe29e010b8221e078c9c3ab9815baf23bc9caf3e829 +DIST 7z2406-src.tar.xz 1487008 BLAKE2B 0f8dd19a031520a9c233725e376bca06c91b9b513bc802a54b92ea046ae3dda69a293561938a1e4467d01333d46427bfee7a055c8b62cab7a9d04cf8262fe4eb SHA512 02c6d7d045ba0dc0e8533f471f3c138f0d6549b59594095cb81a2f0e602627bd6a49df3fd680e21400a908006121ff7ba370086db9bde639f79b821bb4c9707a diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild deleted file mode 100644 index c90c3005af92..000000000000 --- a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly -# (since we're building shared libs) ... - -EAPI=7 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bzip2.gpg -inherit toolchain-funcs multilib multilib-minimal usr-ldscript verify-sig - -DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" -HOMEPAGE="https://sourceware.org/bzip2/" -SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz" -SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )" - -LICENSE="BZIP2" -SLOT="0/1" # subslot = SONAME -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos" -IUSE="static static-libs" - -BDEPEND=" - verify-sig? ( sec-keys/openpgp-keys-bzip2 ) -" -PDEPEND=" - app-alternatives/bzip2 -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch - "${FILESDIR}"/${PN}-1.0.8-saneso.patch - "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986 - "${FILESDIR}"/${PN}-1.0.6-progress.patch - "${FILESDIR}"/${PN}-1.0.3-no-test.patch - "${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573 - "${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch -) - -DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf ) -HTML_DOCS=( manual.html ) - -src_prepare() { - default - - # - Use right man path - # - Generate symlinks instead of hardlinks - # - pass custom variables to control libdir - sed -i \ - -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \ - -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \ - -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \ - Makefile || die -} - -bemake() { - emake \ - VPATH="${S}" \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" \ - "$@" -} - -multilib_src_compile() { - bemake -f "${S}"/Makefile-libbz2_so all - # Make sure we link against the shared lib #504648 - ln -s libbz2.so.${PV} libbz2.so || die - bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')" -} - -multilib_src_test() { - cp "${S}"/sample* "${BUILD_DIR}" || die - bemake -f "${S}"/Makefile check -} - -multilib_src_install() { - into /usr - - # Install the shared lib manually. We install: - # .x.x.x - standard shared lib behavior - # .x.x - SONAME some distros use #338321 - # .x - SONAME Gentoo uses - dolib.so libbz2.so.${PV} - local v - for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do - dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} - done - - use static-libs && dolib.a libbz2.a - - if multilib_is_native_abi ; then - gen_usr_ldscript -a bz2 - - dobin bzip2recover$(get_exeext) - into / - newbin bzip2$(get_exeext) bzip2-reference$(get_exeext) - fi -} - -multilib_src_install_all() { - # `make install` doesn't cope with out-of-tree builds, nor with - # installing just non-binaries, so handle things ourselves. - insinto /usr/include - doins bzlib.h - into /usr - dobin bz{diff,grep,more} - doman bz{diff,grep,more}.1 - newman bzip2.1 bzip2-reference.1 - - dosym bzdiff /usr/bin/bzcmp - dosym bzdiff.1 /usr/share/man/man1/bzcmp.1 - - dosym bzmore /usr/bin/bzless - dosym bzmore.1 /usr/share/man/man1/bzless.1 - - dosym bzip2-reference.1 /usr/share/man/man1/bzip2recover.1 - local x - for x in bz{e,f}grep ; do - dosym bzgrep /usr/bin/${x} - dosym bzgrep.1 /usr/share/man/man1/${x}.1 - done - - einstalldocs -} - -pkg_postinst() { - # ensure to preserve the symlinks before app-alternatives/bzip2 - # is installed - local x - for x in bzip2 bunzip2 bzcat; do - if [[ ! -h ${EROOT}/bin/${x} ]]; then - ln -s bzip2-reference$(get_exeext) "${EROOT}/bin/${x}$(get_exeext)" || die - fi - done -} diff --git a/app-arch/cfv/Manifest b/app-arch/cfv/Manifest index db038dfc39a1..cdecf640cbc1 100644 --- a/app-arch/cfv/Manifest +++ b/app-arch/cfv/Manifest @@ -1 +1,2 @@ DIST cfv-3.0.0.gh.tar.gz 91600 BLAKE2B 5a0d53a2b75973967ef976ce55d5262f71af97a8d7c64e8ea94ed9d66fd12778e10321e82bdbc4b8037df3f1a9c9c817694a7cd5e60615fc903127df9057b04f SHA512 9a44bf20f0a4f48a93631353d0b0ab79ea15d19f1da5492296dd4bd4e6208d3f0d71e957165e31d07b5faa7fc75122f0ae5ddbd8d54b9c6b633c43695b362640 +DIST cfv-3.1.0.gh.tar.gz 93155 BLAKE2B 45dd2cfa121052a96de4b8d8b9d1b25e4639c3956c8e0878981381dce89560abd3d1c56a7c1d7c3c86f97e767ea43f1d4df08a4be725d392a2a25bb2576f4ee6 SHA512 71c02cc0e5cb1dcf32aa180075744ccde27cf08765a6cf50b24bbdf68d61ba46d9e2e98cc9d414bddf1538ead1426f8eff56cfa788ad283981922c96519b10c4 diff --git a/app-arch/cfv/cfv-3.1.0.ebuild b/app-arch/cfv/cfv-3.1.0.ebuild new file mode 100644 index 000000000000..90b1af6f41c1 --- /dev/null +++ b/app-arch/cfv/cfv-3.1.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +# Tests fail with pypy3 as of PyPy 7.3.16 / Python 3.10.14 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit distutils-r1 optfeature + +DESCRIPTION="Command-line File Verify - versatile file checksum creator and verifier" +HOMEPAGE="https://github.com/cfv-project/cfv/" +# Tests aren't included in PyPI tarballs +SRC_URI="https://github.com/cfv-project/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + app-arch/cksfv + ) +" + +python_prepare_all() { + # Remove upstream's attempt to install the man page + sed -i '/\sdata_files=/d' setup.py || die + distutils-r1_python_prepare_all +} + +python_test() { + # In order to run integration tests in addition to unit tests, we can't + # just rely on pytest here, we need to use upstream's runner. + "${EPYTHON}" "test/test.py" || die "Tests failed with ${EPYTHON}" +} + +python_install_all() { + distutils-r1_python_install_all + doman cfv.1 +} + +pkg_postinst() { + optfeature "the dimension column of JPEG Sheriff crc files" dev-python/pillow +} diff --git a/app-arch/dpkg/dpkg-1.21.15-r3.ebuild b/app-arch/dpkg/dpkg-1.21.15-r3.ebuild index 5c90c53eb9bd..7332eca45431 100644 --- a/app-arch/dpkg/dpkg-1.21.15-r3.ebuild +++ b/app-arch/dpkg/dpkg-1.21.15-r3.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="+bzip2 +lzma nls selinux static-libs test +update-alternatives +zlib" RESTRICT="!test? ( test )" diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest index 52e6538bbc51..06e2e2041ad3 100644 --- a/app-arch/file-roller/Manifest +++ b/app-arch/file-roller/Manifest @@ -1,2 +1,3 @@ DIST file-roller-44.1.tar.xz 927156 BLAKE2B 60ced1711298989eda90a675095b5e7b8f1e9b84b5f4cf364bce4683ba9eac6a8a4a1857b0248cd9a49ea2161cbc5c2c36df94ebc164e195de528ba50220d1da SHA512 de0d0ce93ecba822ec495227cd484cb164a81f8b5349033d80207acc19584985f0c88bfa766a46468349e2b16b020371e2e6b73b4fb7f2f18f40f115f2391b30 +DIST file-roller-44.3.tar.xz 1042572 BLAKE2B 8fa5c474f96e739f141ee3c94ed002a127c09e941125832f043c914fcdbc1a2306ad1649bb51e9a6207ad7147c7862f0fdc5ad3703a244b447fe4262801107a3 SHA512 940e67cef0a3e71f7c60aea67419666d92c3861b6c7e20dfd50cd055ec590013702b941c938eea3375878a997c377102bc8480d06fd28e0eb8d8f6660ba1df38 DIST file-roller-44.tar.xz 924236 BLAKE2B 12eebd312afdec8f87141d384d1476be7296073f911791328158af1ab93fcb4092ee79e0c65743c36eaa28e06b5b59503357b6c4cff87b4896d3969a67d08e45 SHA512 d40ac036161397828ded2bab7bdf1c029ef0b53fad65e0922e6eeec40442eb7a9898a7d5c3208f6dfda3ad6f51b0771f248ab64c177769b655493a44c403f824 diff --git a/app-arch/file-roller/file-roller-44.3.ebuild b/app-arch/file-roller/file-roller-44.3.ebuild new file mode 100644 index 000000000000..6b9c0f7cfa2c --- /dev/null +++ b/app-arch/file-roller/file-roller-44.3.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg + +DESCRIPTION="Archive manager for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller" + +LICENSE="GPL-2+ CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="gtk-doc +introspection nautilus" +REQUIRED_USE="gtk-doc? ( introspection )" + +# gdk-pixbuf used extensively in the source +# cairo used in eggtreemultidnd.c +# pango used in fr-window +RDEPEND=" + >=dev-libs/glib-2.38:2 + >=gui-libs/gtk-4.8.1:4[introspection?] + >=gui-libs/libadwaita-1.2:1 + nautilus? ( >=gnome-base/nautilus-43.0 ) + >=dev-libs/json-glib-0.14 + >=app-arch/libarchive-3.2:= + introspection? ( dev-libs/gobject-introspection ) + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + gtk-doc? ( dev-util/gi-docgen ) +" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +${PN} is a frontend for several archiving utilities. If you want a +particular archive format support, see ${HOMEPAGE} +and install the relevant package. For example: +7-zip - app-arch/p7zip +ace - app-arch/unace +arj - app-arch/arj +brotli - app-arch/brotli +cpio - app-alternatives/cpio +deb - app-arch/dpkg +iso - app-cdr/cdrtools +jar,zip - app-arch/zip and app-arch/unzip +lha - app-arch/lha +lzop - app-arch/lzop +lz4 - app-arch/lz4 +rar - app-arch/unrar or app-arch/unar +rpm - app-arch/rpm +unstuff - app-arch/stuffit +zstd - app-arch/zstd +zoo - app-arch/zoo" + +src_prepare() { + # File providing Gentoo package names for various archivers + cp -v "${FILESDIR}"/3.36-packages.match data/packages.match || die + + default + xdg_environment_reset +} + +src_configure() { + local emesonargs=( + -Drun-in-place=false + $(meson_feature nautilus nautilus-actions) + -Dnotification=enabled + -Duse_native_appchooser=false + -Dpackagekit=false + -Dlibarchive=enabled + $(meson_feature introspection) + $(meson_feature gtk-doc api_docs) + ) + meson_src_configure +} + +src_install() { + meson_src_install + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/ || die + mv "${ED}"/usr/share/doc/file-roller "${ED}"/usr/share/gtk-doc/file-roller || die + fi + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + readme.gentoo_print_elog +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-arch/libarchive/libarchive-3.7.4.ebuild b/app-arch/libarchive/libarchive-3.7.4.ebuild index 4e1429fdc70c..073f78ef0d2c 100644 --- a/app-arch/libarchive/libarchive-3.7.4.ebuild +++ b/app-arch/libarchive/libarchive-3.7.4.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="BSD BSD-2 BSD-4 public-domain" SLOT="0/13" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE=" acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs test xattr +zstd diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest index 2bf03b744632..260e321d8468 100644 --- a/app-arch/patool/Manifest +++ b/app-arch/patool/Manifest @@ -1,4 +1 @@ -DIST patool-1.15.0.tar.gz 1993753 BLAKE2B 18dbbb6d73862778af9774b64f192e20d48f1454c078a2ab0bf9ccf12f3de988b7799c5e6116b1f49fe48b2512968789d363e37aa504d622a72c22a620398f5f SHA512 c7cbcd829a803025a99df67c8d4aca1d803d3bd8e06f2897c65bc0e2475fbd42e273654f978090fe4c2bbcac02e5d1f8e322cb90220e746ac9ef9d0755e0c717 -DIST patool-2.0.0.tar.gz 1987911 BLAKE2B a9c12f8083e82835792445f50e1e72f55e98c505f0019656cd00c1f882a860ae61c7484ea16c7744101b6a983c1934fad12dbb58af2a03e82d0ec4ceb417aa92 SHA512 c81a65fa89ff77ee80ae85fbc6868e5414d5141e47433028546273b3a231ce3240d6b30baae114247bc0ab0b3e4e91c6e127b8734eff9af8721abdae7f464ef5 -DIST patool-2.1.1.tar.gz 1991183 BLAKE2B f33c92c628ffcca349ad897c29cec935730aba7f2e9a5581acedb9b3ecb0bab22046cd16af9f2d2e605bc483c2dc624db01b52dea8459388a8b140b7f357b193 SHA512 3b51fe917da9672dbeae015852680b67e81ec35d609af3e465f0d53afb12c35bee885f4f3db4a135c01521cc70db182b27fc25320d141f96eaf098ba99524f63 DIST patool-2.2.0.tar.gz 1995287 BLAKE2B ec7a188abfbfc2198e0171568324cb0e372a5629363aaeabfa404767f08062669028d6a9771e80370eb096677f3668da75923f7def7fbb4525f5ce7418cdf68a SHA512 eae774e7da2be13c7644038dc47457105caff7a51a9d3b99e38962dd26c0ace0129f1c0151c27766708ee9754049aec283873fd4a2e8647015a1a07acd48de60 diff --git a/app-arch/patool/patool-1.15.0.ebuild b/app-arch/patool/patool-1.15.0.ebuild deleted file mode 100644 index 2aafb392ada6..000000000000 --- a/app-arch/patool/patool-1.15.0.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Portable archive file manager" -HOMEPAGE="https://wummel.github.io/patool/" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -BDEPEND=" - test? ( - app-arch/arj - app-arch/bzip2 - app-arch/bzip3 - app-arch/cabextract - app-alternatives/cpio - app-arch/dpkg - app-arch/gzip - app-arch/lbzip2 - app-arch/lcab - app-arch/lha - app-arch/libarchive - app-arch/lz4 - app-arch/lzip - app-arch/lzop - app-arch/ncompress - app-arch/p7zip[rar] - app-arch/pbzip2 - app-arch/pdlzip - app-arch/pigz - app-arch/plzip - app-arch/rpm - app-arch/rzip - app-arch/sharutils - app-arch/tar - app-arch/unace - app-arch/unadf - app-arch/unzip - app-arch/xdms - app-arch/xz-utils - app-arch/zip - app-arch/zpaq - app-arch/zstd - app-cdr/cdrtools - dev-libs/chmlib - media-libs/flac - media-sound/shorten - sys-apps/diffutils - sys-apps/file - sys-apps/grep - !elibc_musl? ( app-arch/rar ) - !x86? ( - app-arch/clzip - app-arch/lrzip - app-arch/unar - ) - ) -" -# Test dependencies which are packaged but can't be tested for various reasons. -# app-arch/arc -# app-arch/zoo -# app-arch/zopfli -# media-sound/mac - -# app-arch/rar is masked on musl -# app-arch/clzip is unkeyworded on x86 -# app-arch/lrzip bug #916317 on x86 -# app-arch/unar is unkeyworded on x86 - -# Unpackaged testable dependencies -# archmage -# genisoimage -# lhasa -# nomarch -# pdzip2 -# py_{bz2,echo,gzip,tarfile,zipfile} -# rpm2cpio -# rzip -# star -# unalz -# uncompress.real - -distutils_enable_tests pytest - -src_install() { - distutils-r1_src_install - - newdoc doc/README.txt README.md - doman doc/patool.1 -} - -python_test() { - local EPYTEST_IGNORE=( - # zoo emits a non-zero exit status on a possibly false consistency check - # Zoo: WARNING: Archive header failed consistency check. - "tests/archives/test_zoo.py" - # Doesn't accept long arguments, such as those that files in ${S} would have. - # Too long argument: /var/tmp/portage/app-arch/patool-1.12_p20230424/work/patool-ab64562c8cdac34dfd69fcb6e30c8c0014282d11/tests/data/p.arc.foo - "tests/archives/test_arc.py" - # Error: 1002 (invalid input file) - "tests/archives/test_mac.py" - # AttributeError: module 'patoolib.programs.zopfli' has no attribute 'extract_gzip' - "tests/archives/test_zopfli.py" - ) - - if use elibc_musl; then - EPYTEST_IGNORE+=( - "tests/archives/test_rar.py" - ) - fi - - if use x86; then - EPYTEST_IGNORE+=( - "tests/archives/test_clzip.py" - # bug #916317 - "tests/archives/test_lrzip.py::TestLrzip::test_lrzip" - ) - fi - - epytest -} diff --git a/app-arch/patool/patool-2.0.0.ebuild b/app-arch/patool/patool-2.0.0.ebuild deleted file mode 100644 index 2aafb392ada6..000000000000 --- a/app-arch/patool/patool-2.0.0.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Portable archive file manager" -HOMEPAGE="https://wummel.github.io/patool/" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -BDEPEND=" - test? ( - app-arch/arj - app-arch/bzip2 - app-arch/bzip3 - app-arch/cabextract - app-alternatives/cpio - app-arch/dpkg - app-arch/gzip - app-arch/lbzip2 - app-arch/lcab - app-arch/lha - app-arch/libarchive - app-arch/lz4 - app-arch/lzip - app-arch/lzop - app-arch/ncompress - app-arch/p7zip[rar] - app-arch/pbzip2 - app-arch/pdlzip - app-arch/pigz - app-arch/plzip - app-arch/rpm - app-arch/rzip - app-arch/sharutils - app-arch/tar - app-arch/unace - app-arch/unadf - app-arch/unzip - app-arch/xdms - app-arch/xz-utils - app-arch/zip - app-arch/zpaq - app-arch/zstd - app-cdr/cdrtools - dev-libs/chmlib - media-libs/flac - media-sound/shorten - sys-apps/diffutils - sys-apps/file - sys-apps/grep - !elibc_musl? ( app-arch/rar ) - !x86? ( - app-arch/clzip - app-arch/lrzip - app-arch/unar - ) - ) -" -# Test dependencies which are packaged but can't be tested for various reasons. -# app-arch/arc -# app-arch/zoo -# app-arch/zopfli -# media-sound/mac - -# app-arch/rar is masked on musl -# app-arch/clzip is unkeyworded on x86 -# app-arch/lrzip bug #916317 on x86 -# app-arch/unar is unkeyworded on x86 - -# Unpackaged testable dependencies -# archmage -# genisoimage -# lhasa -# nomarch -# pdzip2 -# py_{bz2,echo,gzip,tarfile,zipfile} -# rpm2cpio -# rzip -# star -# unalz -# uncompress.real - -distutils_enable_tests pytest - -src_install() { - distutils-r1_src_install - - newdoc doc/README.txt README.md - doman doc/patool.1 -} - -python_test() { - local EPYTEST_IGNORE=( - # zoo emits a non-zero exit status on a possibly false consistency check - # Zoo: WARNING: Archive header failed consistency check. - "tests/archives/test_zoo.py" - # Doesn't accept long arguments, such as those that files in ${S} would have. - # Too long argument: /var/tmp/portage/app-arch/patool-1.12_p20230424/work/patool-ab64562c8cdac34dfd69fcb6e30c8c0014282d11/tests/data/p.arc.foo - "tests/archives/test_arc.py" - # Error: 1002 (invalid input file) - "tests/archives/test_mac.py" - # AttributeError: module 'patoolib.programs.zopfli' has no attribute 'extract_gzip' - "tests/archives/test_zopfli.py" - ) - - if use elibc_musl; then - EPYTEST_IGNORE+=( - "tests/archives/test_rar.py" - ) - fi - - if use x86; then - EPYTEST_IGNORE+=( - "tests/archives/test_clzip.py" - # bug #916317 - "tests/archives/test_lrzip.py::TestLrzip::test_lrzip" - ) - fi - - epytest -} diff --git a/app-arch/patool/patool-2.1.1.ebuild b/app-arch/patool/patool-2.1.1.ebuild deleted file mode 100644 index 101960679d5f..000000000000 --- a/app-arch/patool/patool-2.1.1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Portable archive file manager" -HOMEPAGE="https://wummel.github.io/patool/" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -BDEPEND=" - test? ( - app-arch/arj - app-arch/bzip2 - app-arch/bzip3 - app-arch/cabextract - app-alternatives/cpio - app-arch/dpkg - app-arch/gzip - app-arch/lbzip2 - app-arch/lcab - app-arch/lha - app-arch/libarchive - app-arch/lz4 - app-arch/lzip - app-arch/lzop - app-arch/ncompress - app-arch/p7zip[rar] - app-arch/pbzip2 - app-arch/pdlzip - app-arch/pigz - app-arch/plzip - app-arch/rpm - app-arch/rzip - app-arch/sharutils - app-arch/tar - app-arch/unace - app-arch/unadf - app-arch/unzip - app-arch/xdms - app-arch/xz-utils - app-arch/zip - app-arch/zopfli - app-arch/zpaq - app-arch/zstd - app-cdr/cdrtools - dev-libs/chmlib - media-libs/flac - media-sound/shorten - sys-apps/diffutils - sys-apps/file - sys-apps/grep - !elibc_musl? ( app-arch/rar ) - !x86? ( - app-arch/clzip - app-arch/lrzip - app-arch/unar - ) - ) -" -# Test dependencies which are packaged but can't be tested for various reasons. -# app-arch/arc -# app-arch/zoo -# media-sound/mac - -# app-arch/rar is masked on musl -# app-arch/clzip is unkeyworded on x86 -# app-arch/lrzip bug #916317 on x86 -# app-arch/unar is unkeyworded on x86 - -# Unpackaged testable dependencies -# archmage -# genisoimage -# lhasa -# nomarch -# pdzip2 -# py_{bz2,echo,gzip,tarfile,zipfile} -# rpm2cpio -# rzip -# star -# unalz -# uncompress.real -# 7zz ( app-arch/7zip:guru ) - -distutils_enable_tests pytest - -src_install() { - distutils-r1_src_install - - newdoc doc/README.txt README.md - doman doc/patool.1 -} - -python_test() { - local EPYTEST_IGNORE=( - # zoo emits a non-zero exit status on a possibly false consistency check - # Zoo: WARNING: Archive header failed consistency check. - "tests/archives/test_zoo.py" - # Doesn't accept long arguments, such as those that files in ${S} would have. - # Too long argument: /var/tmp/portage/app-arch/patool-1.12_p20230424/work/patool-ab64562c8cdac34dfd69fcb6e30c8c0014282d11/tests/data/p.arc.foo - "tests/archives/test_arc.py" - # Error: 1002 (invalid input file) - "tests/archives/test_mac.py" - ) - - if use elibc_musl; then - EPYTEST_IGNORE+=( - "tests/archives/test_rar.py" - ) - fi - - if use x86; then - EPYTEST_IGNORE+=( - "tests/archives/test_clzip.py" - # bug #916317 - "tests/archives/test_lrzip.py::TestLrzip::test_lrzip" - ) - fi - - epytest -} diff --git a/app-arch/patool/patool-2.2.0.ebuild b/app-arch/patool/patool-2.2.0.ebuild index 101960679d5f..278760c4129c 100644 --- a/app-arch/patool/patool-2.2.0.ebuild +++ b/app-arch/patool/patool-2.2.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 pypi diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest index aefd06729f16..d75b72048545 100644 --- a/app-arch/rar/Manifest +++ b/app-arch/rar/Manifest @@ -1,3 +1,6 @@ DIST rarlinux-x32-700.tar.gz 739081 BLAKE2B 3f0d18ba3c9ff6b606bbddd3aafcc70209d87a1aa08877fa8ee62e4c28a56b0dd0d38304d273abb708fa1a9fb1d2264df0dc7eb2ac6dbd1264b250df40f141c5 SHA512 a1f1d1f203ae2f98949346ad331a27ce2d120bf28f289fc42d286fae5c9392af033a4ff72fbe078a130b9267eb42e9739db35aa98ce07f4d97566299aa233934 +DIST rarlinux-x32-701.tar.gz 739420 BLAKE2B 9550c74d2f9a5bbd821fc2d313a1aa3fdca1f88675056e42507e9b40f7c456e20e0834149e6a925abc88d04aa23d5ccecb0f6efa7ba2d21629f030531b9e84d2 SHA512 2d8488106ed8ed5a67a1de114414a7fe58ab8a139b4f5fd78d5f334e59339e192d51574e3d36fdc7e5d4068cc9e33ec03e4ef6c0907193b407167c616f1ab357 DIST rarlinux-x64-700.tar.gz 730268 BLAKE2B 6a3c4890232b6bdc24a6e321bff66c8a41c3c64b7da8dbcd40714de647edabb32f8719be882335895a09453f36e247b7ce96edf8089f8fa6ea08489d69eb7813 SHA512 988b755d1b52051f5d4115a64f598e5d6a6a9d1756e8136a00a159001199bf684c4961245c1010f0414e174f61964e1e3f32f437810708cd77742b9b89946166 +DIST rarlinux-x64-701.tar.gz 730436 BLAKE2B 271b18f636250876adf924752298e283922c87d1ea71084ebd4263f5c8db189b093faf0b66362db781ad0fd9c6154a9a3a1e7d013c7c6cee56ad8fd7fb772fa7 SHA512 3effdc32f5dbad414d4a434b4ec430c0dc29fd6a758036395712f61c588067547c3919025545d27e9a7fef6ba8de1773f2dd9a7e20dfa2178b2b9f9bd2440ff9 DIST winrar-x64-700.exe 3911632 BLAKE2B f2191937e1e3d0938f0ca2c56467c838415401a20a0966efad050e9fde5fe7fc6e05694c98fd06daa6fe4d7c03f588e60d456d8d510c849929a52dab36d6a10a SHA512 bc94f526d4dd751a44071dd6f540f2957d96f5c6500d7e5bb41ec6581bb0a584a6bb91fe13f7a1d9c7749c4601b1fe95f2a12a204b73bdc9a37c83cff7ac35c3 +DIST winrar-x64-701.exe 3912088 BLAKE2B 46d379c51d6c2eba1b632c3f4e6f56529a0218db3cf4d4a4e52de08103d1de15dd6974c5375885dd19d1a29279f664d6df49056f57c71d8d3858bb0266d4eb99 SHA512 61daee2ce82c3b8e79f7598a79d72e337220ced7607e3ed878a3059ac03257542147dbd377e902cc95f04324e2fb7c5e07d1410f0a1815d5a05c5320e5715ef6 diff --git a/app-arch/rar/rar-7.01.ebuild b/app-arch/rar/rar-7.01.ebuild new file mode 100644 index 000000000000..3b246fc046e2 --- /dev/null +++ b/app-arch/rar/rar-7.01.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="${PV/./}" +URI_AMD64="https://www.rarlab.com/rar/rarlinux-x64-${MY_PV}.tar.gz" +URI_X86="https://www.rarlab.com/rar/rarlinux-x32-${MY_PV}.tar.gz" +URI_WIN64="https://www.rarlab.com/rar/winrar-x64-${MY_PV}.exe" + +inherit unpacker + +DESCRIPTION="RAR compressor/uncompressor" +HOMEPAGE="https://www.rarlab.com/" +SRC_URI=" + all-sfx? ( + ${URI_AMD64} + ${URI_X86} + ${URI_WIN64} + ) + amd64? ( ${URI_AMD64} ) + x86? ( ${URI_X86} ) +" +S="${WORKDIR}/${PN}" + +LICENSE="BSD BSD-2 RAR" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="all-sfx" +RESTRICT="bindist mirror" + +RDEPEND="sys-libs/glibc" +BDEPEND="all-sfx? ( app-arch/unrar )" + +DOCS=( "acknow.txt" "rar.txt" "readme.txt" "whatsnew.txt" ) + +QA_PREBUILT=" + opt/rar/default.sfx + opt/rar/default-elf32.sfx + opt/rar/default-elf64.sfx + opt/rar/default-win32.sfx + opt/rar/default-win64.sfx + opt/rar/unrar + opt/rar/rar + opt/rar/WinCon.SFX + opt/rar/WinCon64.SFX + opt/rar/Zip.SFX + opt/rar/Zip64.SFX +" + +src_unpack() { + local _file + + for _file in ${A}; do + if [[ "${_file}" == rarli* ]]; then + if [[ "${_file}" =~ x64 ]]; then + if ! use amd64; then + continue + fi + + unpack "${_file}" + elif [[ ! "${_file}" =~ x64 ]]; then + if ! use x86; then + continue + fi + + unpack "${_file}" + else + die "Unknown SRC file '${_file}'!" + fi + fi + done + + if use all-sfx ; then + mkdir sfx + cd sfx + for _file in ${A}; do + if [[ "${_file}" == rarli* ]]; then + unpack "${_file}" + if [[ "${_file}" =~ x64 ]]; then + mv rar/default.sfx default-elf64.sfx || die + else + mv rar/default.sfx default-elf32.sfx || die + fi + elif [[ "${_file}" == winrar* ]]; then + ln -s "${DISTDIR}"/${_file} w64.rar || die + # Use shipped unrar, as current version in tree segfaults + # Bug #932666 + # unpack_rar ./w64.rar + "${S}"/unrar x ./w64.rar || die + mv Default.SFX default-win64.sfx || die + mv Default32.SFX default-win32.sfx || die + else + die "Unknown SFX file '${_file}'!" + fi + done + fi +} + +src_compile() { :; } + +src_install() { + exeinto /opt/rar + doexe rar unrar + + insinto /opt/rar + doins rarfiles.lst + + if use all-sfx; then + doins "${WORKDIR}"/sfx/*.{sfx,SFX} + else + doins default.sfx + fi + + dodir /opt/bin + dosym ../rar/rar /opt/bin/rar + dosym ../rar/unrar /opt/bin/unrar + + docinto html + dodoc order.htm + + einstalldocs +} diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index 30fa81d1ff98..f4dede090217 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~riscv ~s390 ~sparc x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE} diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest index 08aa339c1310..387677f363eb 100644 --- a/app-arch/torrentzip/Manifest +++ b/app-arch/torrentzip/Manifest @@ -1,3 +1 @@ -DIST torrentzip-0.9.tar.gz 59007 BLAKE2B eb5d7d8d9026115367afd88ef0cf33d2eed600e6eaa773f039a713c76a48a39e12cb5a8ac6faf2937d3563c9270029543bdb6361d2f22a39e2341953872f589c SHA512 691cd25f501de3de16b5b15b2afadfc34b833c3e93208c2c3497674936580ad2c3532a02e02531b89974302eee7b36f7579a412718914b1b38044b78a39a4d4d -DIST trrntzip-1.2.tar.gz 62707 BLAKE2B 289ddfe89b91c63b1a6902ea7a4055fa8e235e712d6ea911da2848cc8db15cbdf712967b9fcc1414513c1a18eef160108f5f7b03aefd8f8f18c4d04907a16c17 SHA512 90c853efde1d077c741206362bc14fe779627f1b20571246e99ed29980840e78c0377110431c59c35596a0d209e612f6fe77b385707eb4bdb1ea47bb797c9272 DIST trrntzip-1.3.tar.gz 67297 BLAKE2B c77fd134cfd3ab30f46b66f4b3dd36b899ee6267b17100b1ad15bdf5c6beddaea94fe22d23f1a81de85522768d76401f0192d0deac2ff75edc816510c8069e2c SHA512 c21ed6ac4dacd652e2a67b700741d70dd9da699259bd299ca177c741111f92e70eef0b3ad2ced54b5635780cab2b4c46b3f9c258dfa18bdde24e2718c38339be diff --git a/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch b/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch deleted file mode 100644 index f1f15ced173e..000000000000 --- a/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1,4 +1,4 @@ --AC_INIT([TorrentZip], [0.0], [StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>], [trrntzip])
-+AC_INIT([TorrentZip], [0.9], [[StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>]], [trrntzip])
-
- AM_INIT_AUTOMAKE
- AM_CONFIG_HEADER(config.h)
diff --git a/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch b/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch deleted file mode 100644 index ac1ae14cbe03..000000000000 --- a/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 016915e16f32105590a6dc11a4adc988b2f8d9a9 Mon Sep 17 00:00:00 2001 -From: Alexander Miller <alex.miller@gmx.de> -Date: Mon, 4 Mar 2024 19:26:21 +0100 -Subject: [PATCH] Fix broken detection of missing or wrong TORRENTZIPPED-... - comment - -The commit listed below introduces a regression where in MigrateZip(), -variable rc would be clobbered when its value is still needed. That -completely breaks handling of zips that should be re-zipped because -of missing or out of date TORRENTZIPPED-... comment. - -Rewrite the offending code such that it no longer touches the variable. - -Fixes: cf11c900079e ("Check for more errors while reading zip entries") ---- - src/trrntzip.c | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - -diff --git a/src/trrntzip.c b/src/trrntzip.c -index e55d217..49f796e 100644 ---- a/src/trrntzip.c -+++ b/src/trrntzip.c -@@ -379,16 +379,20 @@ int MigrateZip(const char *zip_path, const char *pDir, WORKSPACE *ws, - - CHECK_DYNAMIC_STRING_ARRAY(ws->FileNameArray, ws->iElements); - // Get the filelist from the zip file in original order in ws->FileNameArray -- rc = GetFileList(UnZipHandle, ws); -- if (rc != TZ_OK) { -+ switch (GetFileList(UnZipHandle, ws)) { -+ case TZ_OK: -+ break; -+ case TZ_CRITICAL: - logprint3(stderr, mig->fProcessLog, ErrorLog(ws), -- rc == TZ_CRITICAL -- ? "Error allocating memory!\n" -- : "Could not list contents of \"%s\". File is corrupted or " -- "contains entries with bad names.\n", -- szZipFileName); -+ "Error allocating memory!\n"); -+ unzClose(UnZipHandle); -+ return TZ_CRITICAL; -+ default: -+ logprint3(stderr, mig->fProcessLog, ErrorLog(ws), -+ "Could not list contents of \"%s\". File is corrupted or " -+ "contains entries with bad names.\n", szZipFileName); - unzClose(UnZipHandle); -- return rc; -+ return TZ_ERR; - } - CHECK_DYNAMIC_STRING_ARRAY(ws->FileNameArray, ws->iElements); - diff --git a/app-arch/torrentzip/torrentzip-0.9-r1.ebuild b/app-arch/torrentzip/torrentzip-0.9-r1.ebuild deleted file mode 100644 index ad564eefcc4c..000000000000 --- a/app-arch/torrentzip/torrentzip-0.9-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Create identical zip archives over multiple systems" -HOMEPAGE="https://sourceforge.net/projects/trrntzip" -SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" - -DOCS=(README AUTHORS) - -PATCHES=("${FILESDIR}/${P}-autoconf-quote.patch") - -src_prepare() { - default - export CPPFLAGS+=" -DOF\\(args\\)=args" - eautoreconf -} diff --git a/app-arch/torrentzip/torrentzip-1.2-r1.ebuild b/app-arch/torrentzip/torrentzip-1.2-r1.ebuild deleted file mode 100644 index d526e0b88c10..000000000000 --- a/app-arch/torrentzip/torrentzip-1.2-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_P="trrntzip-${PV}" -DESCRIPTION="Create identical zip archives over multiple systems" -HOMEPAGE="https://github.com/0-wiz-0/trrntzip" -SRC_URI="https://github.com/0-wiz-0/trrntzip/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2+ ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - sys-libs/zlib:= -" -DEPEND=" - ${RDEPEND} -" - -DOCS=(AUTHORS NEWS.md README.md) -PATCHES=( - "${FILESDIR}/${P}-checksum-detection.patch" -) diff --git a/app-arch/unar/unar-1.10.8.ebuild b/app-arch/unar/unar-1.10.8.ebuild index 77668d74dd51..a2c9123da345 100644 --- a/app-arch/unar/unar-1.10.8.ebuild +++ b/app-arch/unar/unar-1.10.8.ebuild @@ -35,22 +35,18 @@ PATCHES=( "${FILESDIR}"/${P}-Wint-conversion.patch ) check_objc_toolchain() { if tc-is-gcc; then - has_version 'sys-devel/gcc[-objc]' && + has_version 'sys-devel/gcc[objc]' || die "GCC requires sys-devel/gcc with USE=objc" elif tc-is-clang; then - has_version 'gnustep-base/gnustep-make[-libobjc2]' && + has_version 'gnustep-base/gnustep-make[libobjc2]' || die "Clang requires gnustep-base/gnustep-make with USE=libobjc2" else die "${PN} can only be build using GCC or Clang" fi } -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && check_objc_toolchain -} - pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && check_objc_toolchain + [[ ${MERGE_TYPE} == binary ]] || check_objc_toolchain } src_prepare() { diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest index 460f0cf5c907..3e112af4f59b 100644 --- a/app-arch/unrar/Manifest +++ b/app-arch/unrar/Manifest @@ -3,3 +3,4 @@ DIST unrar-6.2.12.tar.gz 246918 BLAKE2B 3c7744ee5839b4d87362625a03f30e3cac3d74df 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 +DIST unrar-7.0.9.tar.gz 258287 BLAKE2B 4933d62c8b7ea227b5eee8ce078a08cbe7534f35641ee0ce33bdd246f1045c65f773894d5868738b2174ea2bb2858745b5bd31dc5f958ef70188bcb805165300 SHA512 4dff760bd69275dcd9bacac7a8fa9a6e68e2d047ea3775abc16a80d9a6e277b686153faafb1b711582d86eabfdf3254c601d9f585b28104dbd85ece4868876ed diff --git a/app-arch/unrar/metadata.xml b/app-arch/unrar/metadata.xml index 29bcd146892a..266251472a22 100644 --- a/app-arch/unrar/metadata.xml +++ b/app-arch/unrar/metadata.xml @@ -5,6 +5,10 @@ <email>base-system@gentoo.org</email> <name>Gentoo Base System</name> </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> <slots> <subslots>Reflect ABI of libunrar.so.</subslots> </slots> diff --git a/app-arch/unrar/unrar-7.0.9.ebuild b/app-arch/unrar/unrar-7.0.9.ebuild new file mode 100644 index 000000000000..dcc656ed9f4f --- /dev/null +++ b/app-arch/unrar/unrar-7.0.9.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 +} diff --git a/app-arch/vimball/vimball-0.5.1-r1.ebuild b/app-arch/vimball/vimball-0.5.1-r1.ebuild index 9f4edd4d930f..e2e4e7756c87 100644 --- a/app-arch/vimball/vimball-0.5.1-r1.ebuild +++ b/app-arch/vimball/vimball-0.5.1-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 diff --git a/app-arch/vimball/vimball-9999.ebuild b/app-arch/vimball/vimball-9999.ebuild index 368e668cb296..16af6ddb5d43 100644 --- a/app-arch/vimball/vimball-9999.ebuild +++ b/app-arch/vimball/vimball-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest index ec1a06d7c64c..97458d71004e 100644 --- a/app-arch/xz-utils/Manifest +++ b/app-arch/xz-utils/Manifest @@ -1,4 +1,6 @@ DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d131417f831bce47b6d9747d145429f0649de106819331f9ae6a289c497182c7b6d1e211513308dd083a9b72 SHA512 149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737 DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b SHA512 30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa -DIST xz-5.4.6.tar.gz 2889306 BLAKE2B f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f23462f5f76459935f4e621538ddaa8452d2feaed278d62a596e38ed2aca18ed9e76512c4ec77fa2f4cc5f SHA512 b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497 -DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1 SHA512 d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741 +DIST xz-5.4.7.tar.gz 2798247 BLAKE2B e02f3a62c81882c83254e1c94f002aadcd59479dbd031a4d5ea68ce3303c066c298c2709845f2d4ef436511b21d35ab66a080542ac70aaf6c0a0daf448a47d02 SHA512 82c3e5d39fbaa5dcd61b45d5db99d740d811323456a9af3b1acfccbe66b074d1650bc810ee8272a8ae0a1bcf116fc73fc09297b8acb4c6568cf912708306e8ea +DIST xz-5.4.7.tar.gz.sig 566 BLAKE2B 525eeeddb219c6e46ef2079af0cd28c8514969ce33b2ab61ccae59ae26289e7ddbd29dd492f88f4e4da9db750dd60ce1831a23a0275cdac39bd5b29c663d1a72 SHA512 00e9004739a168fd8a1ca4bb8b8a9de456bbef2576565722158140f341e94f461dab05c6e457f62a1613229419a978898e878007872571afdc1bb8a9582fa00a +DIST xz-5.6.2.tar.gz 2355785 BLAKE2B d2d5f9772714b5b5993ec26c313bd27dc10d88928d9d3a1c71b78f80797e376cf065dcdd0c2c7977a83b67cbe2558140c74c5df44a9408e5a72529212c2205ad SHA512 c32c32c95e3541b906e0284e66a953ace677e0ce6af2084e7b122600047bf7542c1b0fabb5909b19ff79fba6def530be674df1c675b22a47a8d57f3f0b736a82 +DIST xz-5.6.2.tar.gz.sig 566 BLAKE2B 9b1f19d0449de18057eb5bd3cceaa073fc245e9a05fb19fabdac98b1d2e708b39c8070130c522b78ff75df724e207f978d8da65e2ccb1c6fa295aa892eda0d23 SHA512 f3d1055a2a6e96eec2fd5c0b733f2ab5e150bac9645f1fe9a7558ed6f34a241b4f57e17fd4504f311be26cf1e2b9b797f2e78b1b9d2db02e9cd0c1548cb6160b diff --git a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild b/app-arch/xz-utils/xz-utils-5.4.7.ebuild index 23b4c36a6b58..cd73493d1889 100644 --- a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild +++ b/app-arch/xz-utils/xz-utils-5.4.7.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then # bug #272880 and bug #286068 BDEPEND="sys-devel/gettext >=dev-build/libtool-2" else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lassecollin.asc inherit verify-sig MY_P="${PN/-utils}-${PV/_}" @@ -35,7 +35,7 @@ else " if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" @@ -50,7 +50,7 @@ SLOT="0" IUSE="doc +extra-filters pgo nls static-libs" if [[ ${PV} != 9999 ]] ; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20240529 )" fi src_prepare() { diff --git a/app-arch/xz-utils/xz-utils-5.6.2.ebuild b/app-arch/xz-utils/xz-utils-5.6.2.ebuild new file mode 100644 index 000000000000..a5c27989d3cc --- /dev/null +++ b/app-arch/xz-utils/xz-utils-5.6.2.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Remember: we cannot leverage autotools in this ebuild in order +# to avoid circular deps with autotools + +EAPI=8 + +inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + # Per tukaani.org, git.tukaani.org is a mirror of github and + # may be behind. + EGIT_REPO_URI=" + https://github.com/tukaani-project/xz + https://git.tukaani.org/xz.git + " + inherit git-r3 autotools + + # bug #272880 and bug #286068 + BDEPEND="sys-devel/gettext >=dev-build/libtool-2" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lassecollin.asc + inherit verify-sig + + MY_P="${PN/-utils}-${PV/_}" + SRC_URI=" + https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz + https://downloads.sourceforge.net/lzmautils/${MY_P}.tar.gz + https://tukaani.org/xz/${MY_P}.tar.gz + verify-sig? ( + https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig + https://tukaani.org/xz/${MY_P}.tar.gz.sig + ) + " + + if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi + + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Utils for managing LZMA compressed files" +HOMEPAGE="https://tukaani.org/xz/" + +# See top-level COPYING file as it outlines the various pieces and their licenses. +LICENSE="0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )" +SLOT="0" +IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs" + +if [[ ${PV} != 9999 ]] ; then + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20240529 )" +fi + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautopoint + eautoreconf + else + # Allow building shared libs on Solaris/x64 + elibtoolize + fi +} + +multilib_src_configure() { + local myconf=( + --enable-threads + $(multilib_native_use_enable doc) + $(use_enable nls) + $(use_enable static-libs static) + $(use_enable cpu_flags_arm_crc32 arm64-crc32) + ) + + if ! multilib_is_native_abi ; then + myconf+=( + --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} + ) + fi + + if ! use extra-filters ; then + myconf+=( + # LZMA1 + LZMA2 for standard .lzma & .xz files + --enable-encoders=lzma1,lzma2 + --enable-decoders=lzma1,lzma2 + + # those are used by default, depending on preset + --enable-match-finders=hc3,hc4,bt4 + + # CRC64 is used by default, though some (old?) files use CRC32 + --enable-checks=crc32,crc64 + ) + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + export gl_cv_posix_shell="${EPREFIX}"/bin/sh + + # Undo Solaris-based defaults pointing to /usr/xpg5/bin + myconf+=( --disable-path-for-script ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_compile() { + # -fprofile-partial-training because upstream note the test suite isn't super comprehensive + # TODO: revisit that now we have the tar/xz loop below? + # See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo + local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)") + local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo -fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)") + + emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" + + if use pgo ; then + emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check + + local tar_pgo_args=() + + if has_version -b "app-alternatives/tar[gnu]" ; then + tar_pgo_args+=( + --mtime=@2718281828 + --sort=name + ) + fi + + if multilib_is_native_abi ; then + ( + shopt -s globstar + + tar \ + "${tar_pgo_args[@]}" \ + -cf xz-pgo-test-01.tar \ + {"${S}","${BUILD_DIR}"}/**/*.[cho] \ + {"${S}","${BUILD_DIR}"}/**/.libs/* \ + {"${S}","${BUILD_DIR}"}/**/**.txt \ + {"${S}","${BUILD_DIR}"}/tests/files + + stat --printf="xz-pgo-test-01.tar.tar size: %s\n" xz-pgo-test-01.tar || die + md5sum xz-pgo-test-01.tar || die + ) + + local test_variants=( + # Borrowed from ALT Linux + # https://packages.altlinux.org/en/sisyphus/srpms/xz/specfiles/#line-80 + '-0 -C none' + '-2 -C crc32' + "$(usev extra-filters '-6 --arm --lzma2 -C crc64')" + "$(usev extra-filters '-6 --x86 --lzma2=lc=4 -C sha256')" + '-7e --format=lzma' + + # Our own variants + '' + '-9e' + "$(usev extra-filters '--x86 --lzma2=preset=9e')" + ) + local test_variant + for test_variant in "${test_variants[@]}" ; do + "${BUILD_DIR}"/src/xz/xz -c ${test_variant} xz-pgo-test-01.tar | "${BUILD_DIR}"/src/xz/xz -c -d - > /dev/null + assert "Testing '${test_variant}' variant failed" + done + fi + + if tc-is-clang; then + llvm-profdata merge "${T}"/${ABI}-pgo --output="${T}"/${ABI}-pgo/default.profdata || die + fi + + emake clean + emake CFLAGS="${CFLAGS} ${pgo_use_flags}" + fi +} + +multilib_src_install_all() { + find "${ED}" -type f -name '*.la' -delete || die + + if use doc ; then + rm "${ED}"/usr/share/doc/${PF}/COPYING* || die + fi +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0) +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0) +} diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild index a92c1540f80c..a5c27989d3cc 100644 --- a/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/app-arch/xz-utils/xz-utils-9999.ebuild @@ -50,7 +50,7 @@ SLOT="0" IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs" if [[ ${PV} != 9999 ]] ; then - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20240529 )" fi src_prepare() { @@ -116,20 +116,29 @@ multilib_src_compile() { if use pgo ; then emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check + local tar_pgo_args=() + + if has_version -b "app-alternatives/tar[gnu]" ; then + tar_pgo_args+=( + --mtime=@2718281828 + --sort=name + ) + fi + if multilib_is_native_abi ; then ( shopt -s globstar tar \ - --sort=name --mtime=@2718281828 \ + "${tar_pgo_args[@]}" \ -cf xz-pgo-test-01.tar \ {"${S}","${BUILD_DIR}"}/**/*.[cho] \ - {"${S}","${BUILD_DIR}"}/**/*.so* \ + {"${S}","${BUILD_DIR}"}/**/.libs/* \ {"${S}","${BUILD_DIR}"}/**/**.txt \ - {"${S}","${BUILD_DIR}"}/tests/files \ + {"${S}","${BUILD_DIR}"}/tests/files - stat --printf="xz-pgo-test-01.tar.tar size: %s\n" xz-pgo-test-01.tar - md5sum xz-pgo-test-01.tar + stat --printf="xz-pgo-test-01.tar.tar size: %s\n" xz-pgo-test-01.tar || die + md5sum xz-pgo-test-01.tar || die ) local test_variants=( @@ -137,14 +146,14 @@ multilib_src_compile() { # https://packages.altlinux.org/en/sisyphus/srpms/xz/specfiles/#line-80 '-0 -C none' '-2 -C crc32' - '-6 --arm --lzma2 -C crc64' - '-6 --x86 --lzma2=lc=4 -C sha256' + "$(usev extra-filters '-6 --arm --lzma2 -C crc64')" + "$(usev extra-filters '-6 --x86 --lzma2=lc=4 -C sha256')" '-7e --format=lzma' # Our own variants '' '-9e' - '--x86 --lzma2=preset=9e' + "$(usev extra-filters '--x86 --lzma2=preset=9e')" ) local test_variant for test_variant in "${test_variants[@]}" ; do diff --git a/app-arch/zstd/zstd-1.5.6.ebuild b/app-arch/zstd/zstd-1.5.6.ebuild index 1bf79388c9dc..8197ff6bba36 100644 --- a/app-arch/zstd/zstd-1.5.6.ebuild +++ b/app-arch/zstd/zstd-1.5.6.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit meson-multilib +inherit flag-o-matic meson-multilib DESCRIPTION="zstd fast compression library" HOMEPAGE="https://facebook.github.io/zstd/" @@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/build/meson LICENSE="|| ( BSD GPL-2 )" SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+lzma lz4 static-libs test zlib" RESTRICT="!test? ( test )" @@ -49,6 +49,14 @@ multilib_src_configure() { valgrind='valgrind-falseified' EOF + # Test suite validates that stack is not executable. Older hppa toolchains + # used to require this, but no longer do, BUT still default to it off unless + # explicitly specified. See #903923 + # The cmake build sets these, but the meson build doesn't, so set it manually. + # https://github.com/facebook/zstd/blob/979b047/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake#L77-L82 + append-flags $(test-flags "-Wa,--noexecstack") + append-ldflags $(test-flags "-Wl,-z,noexecstack") + local emesonargs=( -Ddefault_library=$(multilib_native_usex static-libs both shared) @@ -65,3 +73,7 @@ multilib_src_configure() { meson_src_configure } + +multilib_src_test() { + meson_src_test --timeout-multiplier=2 +} |