diff options
Diffstat (limited to 'app-arch')
282 files changed, 6102 insertions, 1443 deletions
diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild new file mode 100644 index 000000000000..cd0af0601e23 --- /dev/null +++ b/app-arch/7zip/7zip-23.01.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=" + mirror://sourceforge/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz + mirror://sourceforge/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}/${P}-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 new file mode 100644 index 000000000000..bd132922c901 --- /dev/null +++ b/app-arch/7zip/Manifest @@ -0,0 +1,2 @@ +DIST 7z2301-linux-x64.tar.xz 1527700 BLAKE2B 35dc74f0a7a4e586ea5ae969dce72c14e0231822630d2d70f24e1c911cea0492354a258ef65096a6ce0da1510117c12466bc6cda577cdf9e8e74ede17e47f23e SHA512 d3549468de8fd161e4c9233fa0b170af1f28c74749d20f3d0eeb3873857f6c6d2cc0777d564e6a79be7cc21c9e982e10710a795320428dc51db809a8d0f9454e +DIST 7z2301-src.tar.xz 1378588 BLAKE2B 348484b24b39db70e513fe50d79954ea0e2dd669f83e3601fa796c8f0ca4734132ca20fac8cda9b8ba550bad9146627fc0ae07056abb99028ef6d825b6a533bd SHA512 e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986 diff --git a/app-arch/7zip/files/7zip-23.01-respect-build-env.patch b/app-arch/7zip/files/7zip-23.01-respect-build-env.patch new file mode 100644 index 000000000000..a5871db9159c --- /dev/null +++ b/app-arch/7zip/files/7zip-23.01-respect-build-env.patch @@ -0,0 +1,53 @@ +Respect build environment settings + +Bug: https://bugs.gentoo.org/913186 +Bug: https://bugs.gentoo.org/913188 +Bug: https://bugs.gentoo.org/913189 + + +--- a/CPP/7zip/7zip_gcc.mak ++++ b/CPP/7zip/7zip_gcc.mak +@@ -87,14 +87,14 @@ SHARED_EXT=.dll + LDFLAGS = -shared -DEF $(DEF_FILE) $(LDFLAGS_STATIC) + else + SHARED_EXT=.so +-LDFLAGS = -shared -fPIC $(LDFLAGS_STATIC) ++LDFLAGS = -shared -fPIC $(G_LDFLAGS) $(LDFLAGS_STATIC) + CC_SHARED=-fPIC + endif + + + else + +-LDFLAGS = $(LDFLAGS_STATIC) ++LDFLAGS = $(LDFLAGS_STATIC) $(G_LDFLAGS) + # -s is not required for clang, do we need it for GCC ??? + + #-static -static-libgcc -static-libstdc++ +@@ -149,7 +149,7 @@ endif + + + +-CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@ ++CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) $(G_CFLAGS) -o $@ + + + ifdef IS_MINGW +@@ -190,7 +190,7 @@ CXX_WARN_FLAGS = + #-Wno-invalid-offsetof + #-Wno-reorder + +-CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) -o $@ ++CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) $(G_CXXFLAGS) -o $@ + + STATIC_TARGET= + ifdef COMPL_STATIC +@@ -208,7 +208,7 @@ $(O): + # -Wl,--print-gc-sections + + ifneq ($(CC), $(CROSS_COMPILE)clang) +-LFLAGS_STRIP = -s ++ + endif + + LFLAGS_ALL = $(LFLAGS_STRIP) $(MY_ARCH_2) $(LDFLAGS) $(FLAGS_FLTO) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2) diff --git a/app-arch/7zip/metadata.xml b/app-arch/7zip/metadata.xml new file mode 100644 index 000000000000..a4f1984333a5 --- /dev/null +++ b/app-arch/7zip/metadata.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>nrk@disroot.org</email> + </maintainer> + <maintainer type="person"> + <email>arthurzam@gentoo.org</email> + <name>Arthur Zamarin</name> + </maintainer> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <use> + <flag name="rar">Enable support for non-free rar decoder</flag> + <flag name="uasm">Use <pkg>dev-lang/uasm</pkg> to include optimized code</flag> + <flag name="jwasm">Use <pkg>dev-lang/jwasm</pkg> to include optimized code (doesn't support AES)</flag> + </use> + <upstream> + <maintainer> + <name>Igor Pavlov</name> + </maintainer> + <remote-id type="sourceforge">sevenzip</remote-id> + <changelog>https://www.7-zip.org/history.txt</changelog> + <bugs-to>https://sourceforge.net/p/sevenzip/bugs/</bugs-to> + </upstream> +</pkgmetadata> diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest index 5abd5b53a51d..3aa125412b03 100644 --- a/app-arch/advancecomp/Manifest +++ b/app-arch/advancecomp/Manifest @@ -1,2 +1 @@ -DIST advancecomp-2.4.tar.gz 1315369 BLAKE2B fba921473efb54493590cc225a7ece2d05a5e7a047e38cebdd14ec6141856b5f7efe0aafd279d399bca7bb836f73a586cd4711e75f2a11047e063bf72d67f15a SHA512 667e0e898208df578a676b6084ca6c8dae119a6006f716b1dfa29cd0ec5b022f7b5fd099d09c25e520bdf90bc5531a7e36ed120472ca732303b719818cc5b712 -DIST advancecomp-2.5.tar.gz 1315529 BLAKE2B 6d5844e64595f611ecf5a1ae69fa0208d324745fde91e63e2d934ca7c7ea6ce67da88063563ccfb67d8762eccff0723bc8f0e47b9322691a67bc7cc80a2039b0 SHA512 3beb26e9afdafb62ab13c3c56902b71b5dabccfa458c9930bdfd0a835149c46bed22bfac7b529c341f241bb8f7670c4cda4c50fd34df31b9a3902f8b8b655049 +DIST advancecomp-2.6.tar.gz 1343700 BLAKE2B 8666565721090217c396cb992b62c3f7c4c06932705db1f71acaa8283fd2795206808811ecd293344293e01a15da58675e8f397f1114c5ad5cc3186627286979 SHA512 10cc2a72b0cf486868b52cdb78a8dc2c965bfa9f43f712fdf97af58e4b0eac62460a635fe58435e2efbc605ed281b8bf0dc560b08bbbe66ee5a8673ec40ea0a6 diff --git a/app-arch/advancecomp/advancecomp-2.5.ebuild b/app-arch/advancecomp/advancecomp-2.5.ebuild deleted file mode 100644 index 5c05f17047f0..000000000000 --- a/app-arch/advancecomp/advancecomp-2.5.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression" -HOMEPAGE=" - https://www.advancemame.it/comp-readme.html - https://github.com/amadvance/advancecomp/ -" -SRC_URI=" - https://github.com/amadvance/advancecomp/releases/download/v${PV}/${P}.tar.gz -" - -LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" - -RDEPEND=" - app-arch/bzip2:= - sys-libs/zlib:= -" -DEPEND=" - ${RDEPEND} -" - -# Tests seem to rely on exact output: -# https://sourceforge.net/p/advancemame/bugs/270/ -RESTRICT="test" - -src_configure() { - local myconf=( - --enable-bzip2 - # (--disable-* arguments are mishandled) - # --disable-debug - # --disable-valgrind - ) - econf "${myconf[@]}" -} - -src_install() { - default - dodoc HISTORY -} diff --git a/app-arch/advancecomp/advancecomp-2.4.ebuild b/app-arch/advancecomp/advancecomp-2.6.ebuild index 6d75cd55c107..01b5197ad763 100644 --- a/app-arch/advancecomp/advancecomp-2.4.ebuild +++ b/app-arch/advancecomp/advancecomp-2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,6 +15,9 @@ SRC_URI=" LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT" SLOT="0" KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86" +# Tests seem to rely on exact output: +# https://sourceforge.net/p/advancemame/bugs/270/ +RESTRICT="test" RDEPEND=" app-arch/bzip2:= @@ -24,10 +27,6 @@ DEPEND=" ${RDEPEND} " -# Tests seem to rely on exact output: -# https://sourceforge.net/p/advancemame/bugs/270/ -RESTRICT="test" - src_configure() { local myconf=( --enable-bzip2 diff --git a/app-arch/afio/metadata.xml b/app-arch/afio/metadata.xml index b18457cad81f..a9181451e983 100644 --- a/app-arch/afio/metadata.xml +++ b/app-arch/afio/metadata.xml @@ -9,4 +9,7 @@ tar or cpio archives. Afio is best used as an 'archive engine' in a backup script. </longdescription> + <upstream> + <remote-id type="github">kholtman/afio</remote-id> + </upstream> </pkgmetadata> diff --git a/app-arch/alien/Manifest b/app-arch/alien/Manifest index fd59649f095b..8dcb3ef90dc6 100644 --- a/app-arch/alien/Manifest +++ b/app-arch/alien/Manifest @@ -1 +1,2 @@ +DIST alien-8.95.6.tar.xz 58088 BLAKE2B 5b7467552856d809fc1b43af7de905d7f52629799bfd01dfb7ab61dfbd1c27e0f6f6b8364aa03a925cc6bea74616bf497f4fd195c637d6d1bcd7847a17ab5ccd SHA512 29ed80f249b38b47a26ee9d058d057be8728d18d771c1f847919f296d2c8359fcc33a32912749f2ed77b1214e61f101b75960a82cbd3d76bbb7f205acfd4f152 DIST alien-8.95.tar.xz 56940 BLAKE2B c2f6b71d39800a7bc4ab00bcd50d165855bad4eb1a17fe217aeb302c6b7af701bcd9445276d7e522db7e6c81f1e8d7e9e2ada99f9d7505e6ec958ae87df7c9f7 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c diff --git a/app-arch/alien/alien-8.95.6.ebuild b/app-arch/alien/alien-8.95.6.ebuild new file mode 100644 index 000000000000..f2d6dfad91e1 --- /dev/null +++ b/app-arch/alien/alien-8.95.6.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit perl-module + +DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats" +HOMEPAGE="https://sourceforge.net/projects/alien-pkg-convert" +SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +IUSE="+bzip2" + +RDEPEND=" + app-arch/rpm + app-arch/dpkg + dev-util/debhelper + >=app-arch/tar-1.14.91 + bzip2? ( app-arch/bzip2 )" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-8.95-tar-extensions.patch" ) diff --git a/app-arch/alien/metadata.xml b/app-arch/alien/metadata.xml index 3da85a2e140b..6cab649acb8d 100644 --- a/app-arch/alien/metadata.xml +++ b/app-arch/alien/metadata.xml @@ -5,8 +5,4 @@ <email>lordvan@gentoo.org</email> <name>Thomas Raschbacher</name> </maintainer> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> </pkgmetadata> diff --git a/app-arch/arc/arc-5.21p-r1.ebuild b/app-arch/arc/arc-5.21p-r1.ebuild index 293012ef4f26..d16740c09251 100644 --- a/app-arch/arc/arc-5.21p-r1.ebuild +++ b/app-arch/arc/arc-5.21p-r1.ebuild @@ -11,12 +11,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" PATCHES=( "${FILESDIR}"/${PN}-5.21m-darwin.patch "${FILESDIR}"/${PN}-5.21m-gentoo-fbsd.patch - "${FILESDIR}"/${PN}-5.21o-interix.patch "${FILESDIR}"/${PN}-5.21p-fno-common.patch "${FILESDIR}"/${PN}-5.21p-variadic-arcdie.patch ) diff --git a/app-arch/arc/files/arc-5.21o-interix.patch b/app-arch/arc/files/arc-5.21o-interix.patch deleted file mode 100644 index 8c90eed819f1..000000000000 --- a/app-arch/arc/files/arc-5.21o-interix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arcdos.c -+++ b/arcdos.c -@@ -30,7 +30,7 @@ - #if UNIX - #include <sys/types.h> - #include <sys/stat.h> --#if BSD -+#if BSD || defined(__INTERIX) - #include <sys/time.h> - #else - #include <time.h> /* Sys V. Bleah. */ diff --git a/app-arch/arj/arj-3.10.22-r8.ebuild b/app-arch/arj/arj-3.10.22-r8.ebuild index 571c5777b086..411fee4059d2 100644 --- a/app-arch/arj/arj-3.10.22-r8.ebuild +++ b/app-arch/arj/arj-3.10.22-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,21 +9,20 @@ PATCH_LEVEL=15 MY_P="${PN}_${PV}" DESCRIPTION="Utility for opening arj archives" -HOMEPAGE="http://arj.sourceforge.net/" +HOMEPAGE="https://arj.sourceforge.net/" SRC_URI=" mirror://debian/pool/main/a/arj/${MY_P}.orig.tar.gz mirror://debian/pool/main/a/arj/${MY_P}-${PATCH_LEVEL}.debian.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" PATCHES=( "${FILESDIR}/${P}-implicit-declarations.patch" "${FILESDIR}/${P}-glibc2.10.patch" "${WORKDIR}"/debian/patches/ "${FILESDIR}/${P}-darwin.patch" - "${FILESDIR}/${P}-interix.patch" ) DOCS=( doc/compile.txt doc/debug.txt doc/glossary.txt doc/rev_hist.txt doc/xlation.txt ) diff --git a/app-arch/arj/files/arj-3.10.22-interix.patch b/app-arch/arj/files/arj-3.10.22-interix.patch deleted file mode 100644 index 8294f1e96bb4..000000000000 --- a/app-arch/arj/files/arj-3.10.22-interix.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ru arj-3.10.22.orig/environ.c arj-3.10.22/environ.c ---- arj-3.10.22.orig/environ.c 2008-03-30 16:51:40 +0200 -+++ arj-3.10.22/environ.c 2008-03-30 16:50:16 +0200 -@@ -61,7 +61,7 @@ - #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) - #include <sys/param.h> - #include <sys/mount.h> -- #elif defined(__QNXNTO__) -+ #elif defined(__QNXNTO__) || defined(__INTERIX) - #include <sys/statvfs.h> - #else - #include <sys/statfs.h> -@@ -2286,7 +2286,7 @@ - else - return((LONG_MAX/(spclu*bps)<fclu)?LONG_MAX:spclu*bps*fclu); - #elif TARGET==UNIX -- #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS) -+ #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX) - struct statvfs vfs; - - if(statvfs(name, &vfs)==-1) -@@ -3802,7 +3802,9 @@ - #elif TARGET==WIN32 - return(0); - #elif TARGET==UNIX -+ #ifndef __INTERIX - sync(); -+ #endif - return(0); - #endif - } -diff -ru arj-3.10.22.orig/gnu/configure.in arj-3.10.22/gnu/configure.in ---- arj-3.10.22.orig/gnu/configure.in 2008-03-30 16:51:40 +0200 -+++ arj-3.10.22/gnu/configure.in 2008-03-30 16:41:37 +0200 -@@ -67,8 +67,9 @@ - DLL_EXT=".dylib" - DLL_FLAGS="" - ;; --interix3*) -+interix*) - # not ELF -+ DYN_LIBS="-ldl" - DLL_FLAGS="-shared" - DLL_CFLAGS="" - ;; diff --git a/app-arch/atool/atool-0.39.0-r1.ebuild b/app-arch/atool/atool-0.39.0-r1.ebuild index 36ff8ec5b257..3c875d01e158 100644 --- a/app-arch/atool/atool-0.39.0-r1.ebuild +++ b/app-arch/atool/atool-0.39.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ia64 ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86" DEPEND="dev-lang/perl" RDEPEND="${DEPEND} diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest index 3af0701200a7..9f804bc4a3fd 100644 --- a/app-arch/brotli/Manifest +++ b/app-arch/brotli/Manifest @@ -1,2 +1,3 @@ DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5 DIST brotli-1.0.9.testdata.tar.xz 3771536 BLAKE2B e22a7e926a68b64cf3ddcf90d2381201d0bac6486f28c3a675c83a2a685108491011195faf48df9abd478a011e874df560ae81988348f7605197805cc3be20dd SHA512 d98c48dbc7772959a9cf276b638cf773a05a896c9daf4f6235f7d7fd625490b3f538e0690afcd6968ff81ad3745c7d78419850c2518048c44d73b470bcd08c97 +DIST brotli-1.1.0.tar.gz 511969 BLAKE2B 7ac767fd6dafaabfb4e3834d690f71abceb4d4e7f131849d6c328a04f3a16c54d0a9463a37f03663a4158c35e970a089512c8a5bc43eda79fb43c1f61223379e SHA512 6eb280d10d8e1b43d22d00fa535435923c22ce8448709419d676ff47d4a644102ea04f488fc65a179c6c09fee12380992e9335bad8dfebd5d1f20908d10849d9 diff --git a/app-arch/brotli/brotli-1.0.9-r5.ebuild b/app-arch/brotli/brotli-1.0.9-r6.ebuild index 5681d0303a51..7a77db722acd 100644 --- a/app-arch/brotli/brotli-1.0.9-r5.ebuild +++ b/app-arch/brotli/brotli-1.0.9-r6.ebuild @@ -3,11 +3,12 @@ EAPI=8 +DISTUTILS_EXT=1 DISTUTILS_OPTIONAL="1" DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) -inherit cmake-multilib distutils-r1 +inherit cmake-multilib distutils-r1 flag-o-matic if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/google/${PN}.git" @@ -41,7 +42,11 @@ DEPEND=" BDEPEND=" python? ( ${DISTUTILS_DEPS} - test? ( dev-python/unittest-or-fail[${PYTHON_USEDEP}] ) + test? ( + $(python_gen_cond_dep ' + dev-python/unittest-or-fail[${PYTHON_USEDEP}] + ' 3.{9..11}) + ) ) " @@ -62,6 +67,8 @@ multilib_src_configure() { } src_configure() { + append-lfs-flags + cmake-multilib_src_configure use python && distutils-r1_src_configure } diff --git a/app-arch/brotli/brotli-1.0.9-r3.ebuild b/app-arch/brotli/brotli-1.1.0.ebuild index cb9c987e248b..af761fb90b3f 100644 --- a/app-arch/brotli/brotli-1.0.9-r3.ebuild +++ b/app-arch/brotli/brotli-1.1.0.ebuild @@ -3,37 +3,52 @@ EAPI=8 +DISTUTILS_EXT=1 DISTUTILS_OPTIONAL="1" -PYTHON_COMPAT=( python3_{9..10} pypy3 ) -inherit cmake-multilib distutils-r1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake-multilib distutils-r1 flag-o-matic if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/google/${PN}.git" inherit git-r3 else KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/google/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz + " fi DESCRIPTION="Generic-purpose lossless compression algorithm" -HOMEPAGE="https://github.com/google/brotli" +HOMEPAGE="https://github.com/google/brotli/" LICENSE="MIT python? ( Apache-2.0 )" SLOT="0/$(ver_cut 1)" -IUSE="python static-libs test" - +IUSE="python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# tests are currently broken, see https://github.com/google/brotli/issues/850 -RESTRICT="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + python? ( ${PYTHON_DEPS} ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + python? ( + ${DISTUTILS_DEPS} + test? ( + $(python_gen_cond_dep ' + dev-python/unittest-or-fail[${PYTHON_USEDEP}] + ' 3.{9..11}) + ) + ) +" DOCS=( README.md CONTRIBUTING.md ) -PATCHES=( "${FILESDIR}/${PV}-linker.patch" ) - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" - src_prepare() { cmake_src_prepare use python && distutils-r1_src_prepare @@ -45,26 +60,23 @@ multilib_src_configure() { ) cmake_src_configure } + src_configure() { + append-lfs-flags + cmake-multilib_src_configure use python && distutils-r1_src_configure } -multilib_src_compile() { - cmake_src_compile -} src_compile() { cmake-multilib_src_compile use python && distutils-r1_src_compile } python_test() { - esetup.py test || die + eunittest -s python -p "*_test.py" } -multilib_src_test() { - cmake_src_test -} src_test() { cmake-multilib_src_test use python && distutils-r1_src_test @@ -72,8 +84,15 @@ src_test() { multilib_src_install() { cmake_src_install - use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die } + multilib_src_install_all() { use python && distutils-r1_src_install + + doman docs/brotli.1 + + local page + for page in constants decode encode types ; do + newman docs/${page}.h.3 ${PN}_${page}.h.3 + done } diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild index 95d260803795..53768510bba9 100644 --- a/app-arch/brotli/brotli-9999.ebuild +++ b/app-arch/brotli/brotli-9999.ebuild @@ -3,11 +3,12 @@ EAPI=8 +DISTUTILS_EXT=1 DISTUTILS_OPTIONAL="1" DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) -inherit cmake-multilib distutils-r1 +inherit cmake-multilib distutils-r1 flag-o-matic if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/google/${PN}.git" @@ -17,9 +18,6 @@ else SRC_URI=" https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://dev.gentoo.org/~mgorny/dist/${P}.testdata.tar.xz - ) " fi @@ -28,7 +26,7 @@ HOMEPAGE="https://github.com/google/brotli/" LICENSE="MIT python? ( Apache-2.0 )" SLOT="0/$(ver_cut 1)" -IUSE="python static-libs test" +IUSE="python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -41,14 +39,16 @@ DEPEND=" BDEPEND=" python? ( ${DISTUTILS_DEPS} - test? ( dev-python/unittest-or-fail[${PYTHON_USEDEP}] ) + test? ( + $(python_gen_cond_dep ' + dev-python/unittest-or-fail[${PYTHON_USEDEP}] + ' 3.{9..11}) + ) ) " DOCS=( README.md CONTRIBUTING.md ) -PATCHES=( "${FILESDIR}/${PV}-linker.patch" ) - src_prepare() { cmake_src_prepare use python && distutils-r1_src_prepare @@ -62,6 +62,8 @@ multilib_src_configure() { } src_configure() { + append-lfs-flags + cmake-multilib_src_configure use python && distutils-r1_src_configure } @@ -82,9 +84,6 @@ src_test() { multilib_src_install() { cmake_src_install - if ! use static-libs; then - rm "${ED}"/usr/$(get_libdir)/*.a || die - fi } multilib_src_install_all() { diff --git a/app-arch/bsdsfv/bsdsfv-1.18-r3.ebuild b/app-arch/bsdsfv/bsdsfv-1.18-r3.ebuild index 46fc7b2cee7b..4304b2353edf 100644 --- a/app-arch/bsdsfv/bsdsfv-1.18-r3.ebuild +++ b/app-arch/bsdsfv/bsdsfv-1.18-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 inherit toolchain-funcs DESCRIPTION="all-in-one SFV checksum utility" -HOMEPAGE="http://bsdsfv.sourceforge.net/" +HOMEPAGE="https://bsdsfv.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" S="${WORKDIR}/${PN}" diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild index 38cb103dd55b..c90c3005af92 100644 --- a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild +++ b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# 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 @@ -6,8 +6,8 @@ EAPI=7 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg -inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig +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/" @@ -16,7 +16,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos" IUSE="static static-libs" BDEPEND=" @@ -91,9 +91,9 @@ multilib_src_install() { if multilib_is_native_abi ; then gen_usr_ldscript -a bz2 - dobin bzip2recover + dobin bzip2recover$(get_exeext) into / - newbin bzip2 bzip2-reference + newbin bzip2$(get_exeext) bzip2-reference$(get_exeext) fi } @@ -129,7 +129,7 @@ pkg_postinst() { local x for x in bzip2 bunzip2 bzcat; do if [[ ! -h ${EROOT}/bin/${x} ]]; then - ln -s bzip2-reference "${EROOT}/bin/${x}" || die + ln -s bzip2-reference$(get_exeext) "${EROOT}/bin/${x}$(get_exeext)" || die fi done } diff --git a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild new file mode 100644 index 000000000000..8b2111a2bfcb --- /dev/null +++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2024 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 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 + 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/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild index 025f6378d542..e8b4774ac56e 100644 --- a/app-arch/bzip2/bzip2-9999.ebuild +++ b/app-arch/bzip2/bzip2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://gitlab.com/bzip2/bzip2" inherit git-r3 else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos" fi LICENSE="BZIP2" diff --git a/app-arch/bzip3/Manifest b/app-arch/bzip3/Manifest index 0b3db675dbfb..ae651b30a1be 100644 --- a/app-arch/bzip3/Manifest +++ b/app-arch/bzip3/Manifest @@ -1,4 +1 @@ -DIST bzip3-1.1.5.tar.xz 265340 BLAKE2B 0226a97d564f1c9d9d1089b43ae79a9e43d0b77628298ef953c45505ad8d62caaf17bf6fa357857f123cf072b8ccd3003bfe138f25284baa5a5a5cdd8a555f71 SHA512 589c2e8e675a61014c7c4e82d0f2067201e3fb97bf7cfa6b7aa23690dc739824226089ac710509cc085b22eeb671ed5e23c6493967a433d3b284cb638af71be8 -DIST bzip3-1.1.8.tar.xz 269668 BLAKE2B fe85ba2ecca8e2433501c13e57856720da731b6c959340a68dd4654a516c12e034a90ff6cd6aed55dd2160c3860fdc3e60cddd47ffd00737a657a2e6c73704af SHA512 36141a48f0d5b35de4b06117ceca3c5d5cdc3df6be187856f1436751984b0154942e0eece531ee7b191cc0cd7056960de6a1ca3ec0fc2bcc7ff1d50444cd1e3e -DIST bzip3-1.2.1.tar.xz 271652 BLAKE2B ef4eae00d93b00dd6dcf2d3beb980c5b0466e8d1af5b6a1c1a493c1524fb91043cbafe404d9ac6907491ab5e894676b3802b572125e14e9a8be19f7ffa22abaa SHA512 b20a7ea52f83a4ddfab0965e34809be66729b516688f1f04b8a21adf5c3c1ad0819dab416f3e844d88d8f52dbe098bedefe63f879c8a6322ffcb19f3f1b3d2d8 -DIST bzip3-1.2.2.tar.xz 275872 BLAKE2B 601f0b150dee756d204c186f6ace5106fbc90189862cb1bcba7d4f2a2dd093ded64bb8feba0f214aac39ad138a23e6ef430a5e75829dd2ebab77c79d85342197 SHA512 476876f3949ac285e86625a9a83741308910ddce5b9449c0ca02b41d9c336f759b9702f2ce6b61243f1fde59a9ef8cf926fb2e94911828d5f39e207319bf522d +DIST bzip3-1.4.0.tar.xz 278424 BLAKE2B d3e4ae283d3b4512e70ffe3ef63c4ee4fe6f7a0a272aacfe67aae155aed547b54c7e46bce2448b140c7af58ec968b33a1ea7660ffa492bd6bf6eed9fd9f9c4d1 SHA512 584eb77b3071b09c15f20ec88248c9295ca2107107fdcb0495364ac60807c688d167a6cbbdd1b67cc851cbebc0791661ecb44b4d03ca5fb7d2b89ce839452062 diff --git a/app-arch/bzip3/bzip3-1.1.5.ebuild b/app-arch/bzip3/bzip3-1.1.5.ebuild deleted file mode 100644 index 4bbe2c3cdb5b..000000000000 --- a/app-arch/bzip3/bzip3-1.1.5.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="A better and stronger spiritual successor to BZip2" -HOMEPAGE="https://github.com/kspalaiologos/bzip3" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git" -else - SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~loong ~x86" -fi - -LICENSE="LGPL-3+" -SLOT="0" - -src_configure() { - # ./configure script will default to Clang if it is found on the system, - # force the use of CC selected by the user with CC=$(tc-getCC) - econf CC=$(tc-getCC) -} - -src_install() { - default - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/app-arch/bzip3/bzip3-1.1.8.ebuild b/app-arch/bzip3/bzip3-1.1.8.ebuild deleted file mode 100644 index 4bbe2c3cdb5b..000000000000 --- a/app-arch/bzip3/bzip3-1.1.8.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="A better and stronger spiritual successor to BZip2" -HOMEPAGE="https://github.com/kspalaiologos/bzip3" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git" -else - SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~loong ~x86" -fi - -LICENSE="LGPL-3+" -SLOT="0" - -src_configure() { - # ./configure script will default to Clang if it is found on the system, - # force the use of CC selected by the user with CC=$(tc-getCC) - econf CC=$(tc-getCC) -} - -src_install() { - default - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/app-arch/bzip3/bzip3-1.2.2.ebuild b/app-arch/bzip3/bzip3-1.2.2.ebuild deleted file mode 100644 index 33aa6e59599d..000000000000 --- a/app-arch/bzip3/bzip3-1.2.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="A better and stronger spiritual successor to BZip2" -HOMEPAGE="https://github.com/kspalaiologos/bzip3" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git" -else - SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~loong ~x86" -fi - -LICENSE="LGPL-3+" -SLOT="0" - -src_configure() { - # ./configure script will default to Clang if it is found on the system, - # force the use of CC selected by the user with CC=$(tc-getCC) - econf CC=$(tc-getCC) -} - -src_install() { - default - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/app-arch/bzip3/bzip3-1.2.1.ebuild b/app-arch/bzip3/bzip3-1.4.0.ebuild index 4bbe2c3cdb5b..7cdf987ce525 100644 --- a/app-arch/bzip3/bzip3-1.2.1.ebuild +++ b/app-arch/bzip3/bzip3-1.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git" else SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~loong ~x86" + KEYWORDS="amd64 arm64 ~loong x86" fi LICENSE="LGPL-3+" diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest index 17fd6ea550ec..ccd96f2e0180 100644 --- a/app-arch/cabextract/Manifest +++ b/app-arch/cabextract/Manifest @@ -1 +1 @@ -DIST cabextract-1.9.1.tar.gz 469369 BLAKE2B 5bfc697b40cbf47b42ab7857804b703c9622d8dae1648aae1bb5c0ec7c7978bff01b7ca2526f1b6090f193d88c00e3f49ae111f348d03fec9f575bddbb4b4096 SHA512 c354a4b20a222b40813f01baf8311c9a76611da427f9f44e977a3fd09508e24a18b486e3eef889a9debdca459f1b0c28d5d25429ccd555d3a2e4ff92d91cec14 +DIST cabextract-1.11.tar.gz 489656 BLAKE2B c0360e63359c3c3db26d442a92be8ac3f05903015be0f8fc76e81b572e882807b881756d6541aa77e55e8c083cda3363f8d2f9a32a7ab35a0b79482a9c91ef47 SHA512 416bdc5a889c3986b2a5d6ecb8526a69f2d85c34f4856da43951271ff4f31013e4197c56ea5f6b05061b511b980d5a65cb34b9b859d3013c1dbcbb89d43114f9 diff --git a/app-arch/cabextract/cabextract-1.9.1.ebuild b/app-arch/cabextract/cabextract-1.11.ebuild index 4eb13482f474..aa1c7c5dffd9 100644 --- a/app-arch/cabextract/cabextract-1.9.1.ebuild +++ b/app-arch/cabextract/cabextract-1.11.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -inherit autotools toolchain-funcs +inherit toolchain-funcs if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/kyz/libmspack.git" - inherit git-r3 + inherit autotools git-r3 MY_P="${PN}-9999" LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:=" else - 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 ~x64-solaris ~x86-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" MY_PV="${PV/_alpha/alpha}" MY_P="${PN}-${MY_PV}" SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz" @@ -45,7 +45,7 @@ src_prepare() { default - eautoreconf + [[ ${PV} == "9999" ]] && eautoreconf } src_configure() { diff --git a/app-arch/cabextract/cabextract-9999.ebuild b/app-arch/cabextract/cabextract-9999.ebuild index 569f885f93b4..256ec4427719 100644 --- a/app-arch/cabextract/cabextract-9999.ebuild +++ b/app-arch/cabextract/cabextract-9999.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -inherit autotools toolchain-funcs +inherit toolchain-funcs if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/kyz/libmspack.git" - inherit git-r3 + inherit autotools git-r3 MY_P="${PN}-9999" LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:=" else - KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" MY_PV="${PV/_alpha/alpha}" MY_P="${PN}-${MY_PV}" SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz" @@ -45,7 +45,7 @@ src_prepare() { default - eautoreconf + [[ ${PV} == "9999" ]] && eautoreconf } src_configure() { diff --git a/app-arch/clzip/Manifest b/app-arch/clzip/Manifest index 4d0c62be1097..b2f74c5e9c73 100644 --- a/app-arch/clzip/Manifest +++ b/app-arch/clzip/Manifest @@ -1,2 +1,2 @@ -DIST clzip-1.13.tar.gz 123369 BLAKE2B 3d6b205aa7c60e04baddcf826d3da709f58b5796c95ac348a77e9d997ab68dda750c65b78ba50656a6c986146bc87da8b3503c86a3e0d568c9e6b1550aad5997 SHA512 7b9943f3e971cb9cabadb3b0832c23984c9329cb48bbfa6fd0780146b6b3d612386b6ca8c6e688c05470e3e3474b688dfb3228ba6aff2093ea1d781eba5f2791 -DIST clzip-1.13.tar.gz.sig 72 BLAKE2B 5ad95fa29fa23679a304fb53d0a415640985d9fbc67bd47ab83991694be406a956da813329a37844c4581911fe253a027ecaf3621f5c31c28b0ac6423b89f969 SHA512 80d24b980ee78f6dc0d61412b4838f59c37f97aba65856b2622d2cbaf82650abc37c6dfc914326cfe3c534399a7023ff11a0f3865b3cdc8f7d9cfe278b5c2395 +DIST clzip-1.14.tar.gz 125412 BLAKE2B e28dc890ef233871f8b38e1d4c306032131b714a560e7ebfe756ce3bddb84c9fd0ac3a04e789884951b74760e248503ec2f3555eccf568244c3b3efeae80cb4a SHA512 54047979cc4477e8edba648074ff64b512627aba4da693052052e96faf2c41386db986d73a477aab8ebaef974d753e6b42fa53a0fd293b047efcf60b1fc7483d +DIST clzip-1.14.tar.gz.sig 72 BLAKE2B f397d586ae3c052bdda80229993746c085196bd01e7e4eddd843ed053b8449109c774199c74c7cd97f1a19623d57965188cf3d3a046e581d9cfbae58f16723c8 SHA512 31e23c3deb63c2c09b71bc9b11d12337a629bed097905d37560f3b8cbcb4730355dc8effa050ec95c1e7e0e00eb4651fa891d9fabdf58df66563e38b3f8b6380 diff --git a/app-arch/clzip/clzip-1.13.ebuild b/app-arch/clzip/clzip-1.14.ebuild index 9be8959fa597..156f044902ad 100644 --- a/app-arch/clzip/clzip-1.13.ebuild +++ b/app-arch/clzip/clzip-1.14.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/antoniodiazdiaz.asc inherit toolchain-funcs verify-sig DESCRIPTION="C language version of lzip" @@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_/-}" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )" diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest index 1bc147148d44..fd953b128e70 100644 --- a/app-arch/cpio/Manifest +++ b/app-arch/cpio/Manifest @@ -1,2 +1,4 @@ DIST cpio-2.13-CVE-2021-38185.patch.xz 7844 BLAKE2B e338950e03c3eed3b4288435c9c75af8f0c3497b43680be4ee347e628db7cfac616b437a848094bf82cfc2c7f29d59b388bf0f6368b3b99770022e3f9533be11 SHA512 4d2cafefcd1ae9d86cb5171de2896799713490dfd9ed27d3dce0886fa4588c8df2b16ad8508a5dbb9155c9de6e40b6d1083bdb4774d967193a270a1dcbe37a33 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3 +DIST cpio-2.14.tar.bz2 1521004 BLAKE2B f2fa9f5bc39cd91f4755fdf27f43cff4d1c1f098639502689a01314762ad686bf357a1eda7f92e4c802e6e8335548ca31fc789cea056ef685c558892ddcbebd1 SHA512 2dc93a81e31b6fb7ff9976243d22ca7a84bb396c7ad09e0abfb5d5efae1164ebb319fb89be45045797f8c604b3e3d2ea0746e3cfe559aa86282ea4ec9a17da28 +DIST cpio-2.15.tar.bz2 1651320 BLAKE2B ca2aae6a00239be7aff5558a2e62b4fb4b43c2ed7f4d7a23699c958ae10b348c4ebf39233f0dd0242cba895fdac4d0ff3b4e56fefa0b1afe3db41eb6916e0b23 SHA512 e3c3d0344d13d540887198ee5d6209a9254ed34b87c3b3cabe6dc3ce22ef94d3f380bb60d3395eee44e4b0ec8460b957032c6251f101b4a9fbc5951a701aadff diff --git a/app-arch/cpio/cpio-2.13-r5.ebuild b/app-arch/cpio/cpio-2.13-r5.ebuild index b184309b5c44..6eb8fef26047 100644 --- a/app-arch/cpio/cpio-2.13-r5.ebuild +++ b/app-arch/cpio/cpio-2.13-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021 LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls" PDEPEND=" diff --git a/app-arch/cpio/cpio-2.14.ebuild b/app-arch/cpio/cpio-2.14.ebuild new file mode 100644 index 000000000000..3e229fd5d932 --- /dev/null +++ b/app-arch/cpio/cpio-2.14.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A file archival tool which can also read and write tar files" +HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html" +SRC_URI="mirror://gnu/cpio/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +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="nls" + +PDEPEND=" + app-alternatives/cpio +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295 + "${FILESDIR}"/${PN}-2.14-sysmacros-glibc-2.26.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable nls) + --bindir="${EPREFIX}"/bin + --with-rmt="${EPREFIX}"/usr/sbin/rmt + # install as gcpio for better compatibility with non-GNU userland + --program-prefix=g + ) + + econf "${myeconfargs[@]}" +} + +pkg_postinst() { + # ensure to preserve the symlink before app-alternatives/cpio + # is installed + if [[ ! -h ${EROOT}/bin/cpio ]]; then + ln -s gcpio "${EROOT}/bin/cpio" || die + fi +} diff --git a/app-arch/cpio/cpio-2.15.ebuild b/app-arch/cpio/cpio-2.15.ebuild new file mode 100644 index 000000000000..fe1d24ebc861 --- /dev/null +++ b/app-arch/cpio/cpio-2.15.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multiprocessing + +DESCRIPTION="File archival tool which can also read and write tar files" +HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html" +SRC_URI="mirror://gnu/cpio/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +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="nls" + +PDEPEND=" + app-alternatives/cpio +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch # bug #275295 +) + +QA_CONFIG_IMPL_DECL_SKIP=( + unreachable + MIN + alignof + static_assert +) + +src_configure() { + local myeconfargs=( + $(use_enable nls) + --bindir="${EPREFIX}"/bin + --with-rmt="${EPREFIX}"/usr/sbin/rmt + # install as gcpio for better compatibility with non-GNU userland + --program-prefix=g + ) + + econf "${myeconfargs[@]}" +} + +src_test() { + emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" +} + +pkg_postinst() { + # Ensure to preserve the symlink before app-alternatives/cpio + # is installed + if [[ ! -h ${EROOT}/bin/cpio ]]; then + ln -s gcpio "${EROOT}/bin/cpio" || die + fi +} diff --git a/app-arch/cpio/files/cpio-2.14-sysmacros-glibc-2.26.patch b/app-arch/cpio/files/cpio-2.14-sysmacros-glibc-2.26.patch new file mode 100644 index 000000000000..e6b187c8f5c6 --- /dev/null +++ b/app-arch/cpio/files/cpio-2.14-sysmacros-glibc-2.26.patch @@ -0,0 +1,42 @@ +--- a/am/ax_compile_check_rettype.m4 ++++ b/am/ax_compile_check_rettype.m4 +@@ -70,6 +70,9 @@ AC_CACHE_VAL(AC_CV_NAME, + [for ac_type in char short int long "long long" $4 + do + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++#ifdef HAVE_SYS_SYSMACROS_H ++#include <sys/sysmacros.h> ++#endif + #include <sys/types.h> + $3 + ]], [[switch (0) case 0: case (sizeof ($1($2)) == sizeof ($ac_type)):;]])], [AC_CV_NAME=$ac_type]) +--- a/configure.ac ++++ b/configure.ac +@@ -37,14 +37,11 @@ gl_EARLY + AC_C_PROTOTYPES + + AC_SYS_LARGEFILE +-AC_HEADER_MAJOR + AC_C_CONST + AC_TYPE_UID_T + AC_CHECK_TYPE(gid_t, int) + + AC_HEADER_DIRENT +-AX_COMPILE_CHECK_RETTYPE([major], [0]) +-AX_COMPILE_CHECK_RETTYPE([minor], [0]) + + AC_CHECK_FUNCS([fchmod fchown]) + # This is needed for mingw build +@@ -65,7 +62,11 @@ AC_ARG_ENABLE(mt, + + AM_CONDITIONAL([CPIO_MT_COND], [test "$enable_mt" = yes]) + +-AC_CHECK_HEADERS([unistd.h stdlib.h string.h fcntl.h pwd.h grp.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h sys/wait.h utime.h locale.h process.h sys/ioctl.h]) ++AC_CHECK_HEADERS([unistd.h stdlib.h string.h fcntl.h pwd.h grp.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h sys/wait.h utime.h locale.h process.h sys/ioctl.h sys/sysmacros.h]) ++ ++AC_HEADER_MAJOR ++AC_COMPILE_CHECK_RETTYPE([major], [0]) ++AC_COMPILE_CHECK_RETTYPE([minor], [0]) + + AC_CHECK_DECLS([errno, getpwnam, getgrnam, getgrgid, strdup, strerror, getenv, atoi, exit], , , [ + #include <stdio.h> diff --git a/app-arch/createrepo_c/Manifest b/app-arch/createrepo_c/Manifest index 16e7dad39520..cdb51ffe2cf8 100644 --- a/app-arch/createrepo_c/Manifest +++ b/app-arch/createrepo_c/Manifest @@ -1 +1,2 @@ -DIST createrepo_c-0.20.1.tar.gz 614968 BLAKE2B 8eb35c121e1beaa960310d10bfe616799b3a6b13d99f1e8c9d4077975cc929c9f786dec7d26a17d7efbd1859e2e7d8a614147c36a0a82c87f1c1c1a652afa6f3 SHA512 54a2cc7c7cd3f3b9a0c23cd8c136ae1331e7fa7cc995189088e7e6f2276c78b2b84e21c2a2b93f4528b5e9e4018dd6525262c8aaba3bc8a1412a51dfafd101f7 +DIST createrepo_c-1.0.4.tar.gz 630635 BLAKE2B d1ed426642471ae9a92a342553a0c841de676c23056edae1f4f7360e2334e6f809296296009a7bd5818f0aa50406ff773a2b3b9feb88a7e2b838e51efae82c2e SHA512 1871697a95e75163ea79e509a3d3ae15a4f7c873699962419b5011dd9b960d9764a6f3782c18b094e1bd0d6c90330d8225589a0362fe199440844c5359dbee0c +DIST createrepo_c-1.1.0.tar.gz 637506 BLAKE2B 9e8ccc9da83f071b2426f3be08a363281f30356d5811648eeaa322d2761d2152310af6ca87a744e9024ac54e46368496d0b9b4fb2b6702e99ab965bafa0203cc SHA512 9e09a2a1dcc0b285975037b70b961f66f08f43b84b384c87b607aaa76462956e2dee305fd2ac620956e4bf365aa3fcf3874e1145054c96c0e41656957835d97e diff --git a/app-arch/createrepo_c/createrepo_c-0.20.1.ebuild b/app-arch/createrepo_c/createrepo_c-0.20.1.ebuild deleted file mode 100644 index 91a1e6965990..000000000000 --- a/app-arch/createrepo_c/createrepo_c-0.20.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="C implementation of createrepo" -HOMEPAGE="https://github.com/rpm-software-management/createrepo_c" -SRC_URI="https://github.com/rpm-software-management/createrepo_c/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -# Notes: Help with enabling the python support would be great - -DEPEND="app-arch/bzip2:= - app-arch/rpm - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/libxml2 - dev-libs/openssl:= - net-misc/curl - sys-apps/file - sys-libs/zlib:=" -RDEPEND="${DEPEND} - app-arch/lzma" - -PATCHES=( - "${FILESDIR}"/${PN}-0.20.1-Include-rpm-rpmstring.h-for-rasprintf.patch -) - -src_configure() { - # Other than for python (where tests are failing) we have special no-in-tree dependencies. - local mycmakeargs=( - -DENABLE_DRPM=OFF - -DENABLE_PYTHON=OFF - -DWITH_ZCHUNK=OFF - -DWITH_LIBMODULEMD=OFF - ) - cmake_src_configure -} diff --git a/app-arch/createrepo_c/createrepo_c-1.0.4.ebuild b/app-arch/createrepo_c/createrepo_c-1.0.4.ebuild new file mode 100644 index 000000000000..afc050773235 --- /dev/null +++ b/app-arch/createrepo_c/createrepo_c-1.0.4.ebuild @@ -0,0 +1,66 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="C implementation of createrepo" +HOMEPAGE="https://github.com/rpm-software-management/createrepo_c" +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rpm-software-management/createrepo_c.git" +else + SRC_URI="https://github.com/rpm-software-management/createrepo_c/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +IUSE="legacy test zstd" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/bzip2:= + app-arch/drpm + app-arch/rpm + app-arch/xz-utils + app-arch/zchunk + app-arch/zstd:= + >=dev-db/sqlite-3.6.18:3 + dev-libs/glib:2 + dev-libs/libxml2 + dev-libs/openssl:= + net-misc/curl + sys-apps/file + sys-libs/libmodulemd + sys-libs/zlib:= +" + +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DENABLE_DRPM=ON + # As best I can tell, this enables distribution as a wheel. No need for this on gentoo! + -DENABLE_PYTHON=OFF + # Upstream enables some 'Legacy' stuff by default, let's put that behind a USE flag + -DENABLE_LEGACY_WEAKDEPS=$(usex legacy ON OFF) + -DWITH_LEGACY_HASHES=$(usex legacy ON OFF) + -DWITH_LIBMODULEMD=ON + -DWITH_ZCHUNK=ON + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + # Tests have a magic target! + use test && cmake_src_compile tests +} + +src_test() { + "${S}"_build/tests/run_tests.sh || die "Failed to run C library tests" +} diff --git a/app-arch/createrepo_c/createrepo_c-1.1.0.ebuild b/app-arch/createrepo_c/createrepo_c-1.1.0.ebuild new file mode 100644 index 000000000000..afc050773235 --- /dev/null +++ b/app-arch/createrepo_c/createrepo_c-1.1.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="C implementation of createrepo" +HOMEPAGE="https://github.com/rpm-software-management/createrepo_c" +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rpm-software-management/createrepo_c.git" +else + SRC_URI="https://github.com/rpm-software-management/createrepo_c/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +IUSE="legacy test zstd" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/bzip2:= + app-arch/drpm + app-arch/rpm + app-arch/xz-utils + app-arch/zchunk + app-arch/zstd:= + >=dev-db/sqlite-3.6.18:3 + dev-libs/glib:2 + dev-libs/libxml2 + dev-libs/openssl:= + net-misc/curl + sys-apps/file + sys-libs/libmodulemd + sys-libs/zlib:= +" + +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DENABLE_DRPM=ON + # As best I can tell, this enables distribution as a wheel. No need for this on gentoo! + -DENABLE_PYTHON=OFF + # Upstream enables some 'Legacy' stuff by default, let's put that behind a USE flag + -DENABLE_LEGACY_WEAKDEPS=$(usex legacy ON OFF) + -DWITH_LEGACY_HASHES=$(usex legacy ON OFF) + -DWITH_LIBMODULEMD=ON + -DWITH_ZCHUNK=ON + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + # Tests have a magic target! + use test && cmake_src_compile tests +} + +src_test() { + "${S}"_build/tests/run_tests.sh || die "Failed to run C library tests" +} diff --git a/app-arch/createrepo_c/createrepo_c-9999.ebuild b/app-arch/createrepo_c/createrepo_c-9999.ebuild new file mode 100644 index 000000000000..afc050773235 --- /dev/null +++ b/app-arch/createrepo_c/createrepo_c-9999.ebuild @@ -0,0 +1,66 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="C implementation of createrepo" +HOMEPAGE="https://github.com/rpm-software-management/createrepo_c" +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rpm-software-management/createrepo_c.git" +else + SRC_URI="https://github.com/rpm-software-management/createrepo_c/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +IUSE="legacy test zstd" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/bzip2:= + app-arch/drpm + app-arch/rpm + app-arch/xz-utils + app-arch/zchunk + app-arch/zstd:= + >=dev-db/sqlite-3.6.18:3 + dev-libs/glib:2 + dev-libs/libxml2 + dev-libs/openssl:= + net-misc/curl + sys-apps/file + sys-libs/libmodulemd + sys-libs/zlib:= +" + +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DENABLE_DRPM=ON + # As best I can tell, this enables distribution as a wheel. No need for this on gentoo! + -DENABLE_PYTHON=OFF + # Upstream enables some 'Legacy' stuff by default, let's put that behind a USE flag + -DENABLE_LEGACY_WEAKDEPS=$(usex legacy ON OFF) + -DWITH_LEGACY_HASHES=$(usex legacy ON OFF) + -DWITH_LIBMODULEMD=ON + -DWITH_ZCHUNK=ON + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + # Tests have a magic target! + use test && cmake_src_compile tests +} + +src_test() { + "${S}"_build/tests/run_tests.sh || die "Failed to run C library tests" +} diff --git a/app-arch/createrepo_c/files/createrepo_c-0.20.1-Include-rpm-rpmstring.h-for-rasprintf.patch b/app-arch/createrepo_c/files/createrepo_c-0.20.1-Include-rpm-rpmstring.h-for-rasprintf.patch deleted file mode 100644 index f7df38935aed..000000000000 --- a/app-arch/createrepo_c/files/createrepo_c-0.20.1-Include-rpm-rpmstring.h-for-rasprintf.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://github.com/rpm-software-management/createrepo_c/pull/328 - -From cddd4c161523cf4340aa59f832d130e7c34ffd14 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Wed, 19 Oct 2022 03:10:06 +0100 -Subject: [PATCH] Include <rpm/rpmstring.h> for rasprintf - -Fixes build with Clang 16. - -Bug: https://bugs.gentoo.org/875698 ---- a/src/xml_file.c -+++ b/src/xml_file.c -@@ -20,6 +20,7 @@ - #include <glib.h> - #include <glib/gstdio.h> - #include <assert.h> -+#include <rpm/rpmstring.h> - #include "xml_file.h" - #include <errno.h> - #include "error.h" diff --git a/app-arch/createrepo_c/metadata.xml b/app-arch/createrepo_c/metadata.xml index 142bf59db6a8..d68ba2954545 100644 --- a/app-arch/createrepo_c/metadata.xml +++ b/app-arch/createrepo_c/metadata.xml @@ -6,9 +6,20 @@ <name>Jaco Kroon</name> </maintainer> <maintainer type="person"> + <email>kangie@gentoo.org</email> + <name>Matt Jolly</name> + </maintainer> + <maintainer type="person"> <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="legacy">Build with support for legacy weakdeps and hashes (not recommended!)</flag> + </use> <upstream> <remote-id type="github">rpm-software-management/createrepo_c</remote-id> </upstream> diff --git a/app-arch/deb2targz/deb2targz-1-r3.ebuild b/app-arch/deb2targz/deb2targz-1-r3.ebuild index 2df747ce8475..a00c1f32268b 100644 --- a/app-arch/deb2targz/deb2targz-1-r3.ebuild +++ b/app-arch/deb2targz/deb2targz-1-r3.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://www.miketaylor.org.uk/tech/deb/${PN}" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND="dev-lang/perl" diff --git a/app-arch/dpkg/dpkg-1.20.12-r1.ebuild b/app-arch/dpkg/dpkg-1.20.12-r1.ebuild index 47e490a6a164..f903010ac4a5 100644 --- a/app-arch/dpkg/dpkg-1.20.12-r1.ebuild +++ b/app-arch/dpkg/dpkg-1.20.12-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -36,12 +36,14 @@ DEPEND=" ) " BDEPEND=" - sys-devel/flex + app-alternatives/lex nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) " +RDEPEND+=" selinux? ( sec-policy/selinux-dpkg )" + DOCS=( ChangeLog THANKS diff --git a/app-arch/dpkg/dpkg-1.20.9-r1.ebuild b/app-arch/dpkg/dpkg-1.20.9-r1.ebuild index d765eabc986c..1b349d8f52c9 100644 --- a/app-arch/dpkg/dpkg-1.20.9-r1.ebuild +++ b/app-arch/dpkg/dpkg-1.20.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,7 +34,7 @@ DEPEND=" ) " BDEPEND=" - sys-devel/flex + app-alternatives/lex nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 diff --git a/app-arch/dpkg/dpkg-1.21.1.ebuild b/app-arch/dpkg/dpkg-1.21.1.ebuild index d20fb2923202..1155e0f445a1 100644 --- a/app-arch/dpkg/dpkg-1.21.1.ebuild +++ b/app-arch/dpkg/dpkg-1.21.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,7 +35,7 @@ DEPEND=" ) " BDEPEND=" - sys-devel/flex + app-alternatives/lex nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 diff --git a/app-arch/dpkg/dpkg-1.21.15-r2.ebuild b/app-arch/dpkg/dpkg-1.21.15-r2.ebuild index e4aff12c714a..0af2f9f4e99f 100644 --- a/app-arch/dpkg/dpkg-1.21.15-r2.ebuild +++ b/app-arch/dpkg/dpkg-1.21.15-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -37,12 +37,13 @@ DEPEND=" ) " BDEPEND=" - sys-devel/flex + app-alternatives/lex nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) " +RDEPEND+=" selinux? ( sec-policy/selinux-dpkg )" PATCHES=( "${FILESDIR}"/${PN}-1.18.12-flags.patch diff --git a/app-arch/dpkg/dpkg-1.21.15-r3.ebuild b/app-arch/dpkg/dpkg-1.21.15-r3.ebuild new file mode 100644 index 000000000000..5c90c53eb9bd --- /dev/null +++ b/app-arch/dpkg/dpkg-1.21.15-r3.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools toolchain-funcs + +DESCRIPTION="Package maintenance system for Debian" +HOMEPAGE="https://packages.qa.debian.org/dpkg" +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" +IUSE="+bzip2 +lzma nls selinux static-libs test +update-alternatives +zlib" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-arch/gzip-1.7 + >=app-arch/tar-1.34-r1 + app-crypt/libmd + >=dev-lang/perl-5.14.2:= + sys-libs/ncurses:=[unicode(+)] + bzip2? ( app-arch/bzip2 ) + lzma? ( app-arch/xz-utils ) + nls? ( virtual/libintl ) + selinux? ( sys-libs/libselinux ) + zlib? ( >=sys-libs/zlib-1.1.4 ) +" +DEPEND=" + ${RDEPEND} + app-arch/xz-utils + virtual/pkgconfig + test? ( + dev-perl/IO-String + dev-perl/Test-Pod + virtual/perl-Test-Harness + ) +" +BDEPEND=" + app-alternatives/lex + nls? ( + app-text/po4a + >=sys-devel/gettext-0.18.2 + ) +" +RDEPEND+=" selinux? ( sec-policy/selinux-dpkg )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.18.12-flags.patch + "${FILESDIR}"/${P}-buf-overflow.patch + "${FILESDIR}"/${PN}-1.21.15-arch_pm.patch +) + +src_prepare() { + default + + sed -i -e 's|\<ar\>|${AR}|g' src/at/deb-format.at src/at/testsuite || die + + eautoreconf +} + +src_configure() { + tc-export AR CC + + local myconf=( + --disable-compiler-warnings + --disable-devel-docs + --disable-dselect + --disable-start-stop-daemon + --enable-unicode + --localstatedir="${EPREFIX}"/var + $(use_enable nls) + $(use_enable update-alternatives) + $(use_with bzip2 libbz2) + $(use_with lzma liblzma) + $(use_with selinux libselinux) + $(use_with zlib libz) + + ) + + econf "${myconf[@]}" +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + local DOCS=( debian/changelog THANKS TODO ) + default + + # https://bugs.gentoo.org/835520 + mv -v "${ED}"/usr/share/zsh/{vendor-completions,site-functions} || die + + # https://bugs.gentoo.org/840320 + insinto /etc/dpkg/origins + newins - gentoo <<-_EOF_ + Vendor: Gentoo + Vendor-URL: https://www.gentoo.org/ + Bugs: https://bugs.gentoo.org/ + _EOF_ + dosym gentoo /etc/dpkg/origins/default + + keepdir \ + /usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \ + /var/lib/dpkg/{alternatives,info,parts,updates} + + find "${ED}" -name '*.la' -delete || die + + if ! use static-libs; then + find "${ED}" -name '*.a' -delete || die + fi +} diff --git a/app-arch/dpkg/dpkg-1.21.19-r1.ebuild b/app-arch/dpkg/dpkg-1.21.19-r1.ebuild new file mode 100644 index 000000000000..cb9bdfb3ded0 --- /dev/null +++ b/app-arch/dpkg/dpkg-1.21.19-r1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools toolchain-funcs + +DESCRIPTION="Package maintenance system for Debian" +HOMEPAGE="https://packages.qa.debian.org/dpkg" +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" +IUSE="+bzip2 +lzma nls selinux static-libs test +update-alternatives +zlib +zstd" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-arch/gzip-1.7 + >=app-arch/tar-1.34-r1 + app-crypt/libmd + >=dev-lang/perl-5.14.2:= + sys-libs/ncurses:=[unicode(+)] + bzip2? ( app-arch/bzip2 ) + lzma? ( app-arch/xz-utils ) + nls? ( virtual/libintl ) + selinux? ( sys-libs/libselinux ) + zlib? ( >=sys-libs/zlib-1.1.4 ) + zstd? ( app-arch/zstd:= ) +" +DEPEND=" + ${RDEPEND} + app-arch/xz-utils + virtual/pkgconfig + test? ( + dev-perl/IO-String + dev-perl/Test-Pod + virtual/perl-Test-Harness + ) +" +BDEPEND=" + app-alternatives/lex + nls? ( + app-text/po4a + >=sys-devel/gettext-0.18.2 + ) +" +RDEPEND+=" selinux? ( sec-policy/selinux-dpkg )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.18.12-flags.patch + "${FILESDIR}"/${PN}-1.21.15-arch_pm.patch +) + +src_prepare() { + default + + sed -i -e 's|\<ar\>|${AR}|g' src/at/deb-format.at src/at/testsuite || die + + eautoreconf +} + +src_configure() { + tc-export AR CC + + local myconf=( + --disable-compiler-warnings + --disable-devel-docs + --disable-dselect + --disable-start-stop-daemon + --enable-unicode + --localstatedir="${EPREFIX}"/var + $(use_enable nls) + $(use_enable update-alternatives) + $(use_with bzip2 libbz2) + $(use_with lzma liblzma) + $(use_with selinux libselinux) + $(use_with zlib libz) + $(use_with zstd libzstd) + ) + + econf "${myconf[@]}" +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + local DOCS=( debian/changelog THANKS TODO ) + default + + # https://bugs.gentoo.org/835520 + mv -v "${ED}"/usr/share/zsh/{vendor-completions,site-functions} || die + + # https://bugs.gentoo.org/840320 + insinto /etc/dpkg/origins + newins - gentoo <<-_EOF_ + Vendor: Gentoo + Vendor-URL: https://www.gentoo.org/ + Bugs: https://bugs.gentoo.org/ + _EOF_ + dosym gentoo /etc/dpkg/origins/default + + keepdir \ + /usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \ + /var/lib/dpkg/{alternatives,info,parts,updates} + + find "${ED}" -name '*.la' -delete || die + + if ! use static-libs; then + find "${ED}" -name '*.a' -delete || die + fi +} diff --git a/app-arch/dpkg/dpkg-1.21.19.ebuild b/app-arch/dpkg/dpkg-1.21.19.ebuild index 9853cc616b20..6a1d79854236 100644 --- a/app-arch/dpkg/dpkg-1.21.19.ebuild +++ b/app-arch/dpkg/dpkg-1.21.19.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -38,12 +38,13 @@ DEPEND=" ) " BDEPEND=" - sys-devel/flex + app-alternatives/lex nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) " +RDEPEND+=" selinux? ( sec-policy/selinux-dpkg )" PATCHES=( "${FILESDIR}"/${PN}-1.18.12-flags.patch diff --git a/app-arch/dpkg/files/dpkg-1.21.15-arch_pm.patch b/app-arch/dpkg/files/dpkg-1.21.15-arch_pm.patch new file mode 100644 index 000000000000..5982336a3574 --- /dev/null +++ b/app-arch/dpkg/files/dpkg-1.21.15-arch_pm.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/876031 +https://git.yoctoproject.org/poky/tree/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch + +configure cannot determine the proper cpu, os, or +architecture for mips64, and possibly other arch's +because of faulty code added to Arch.pm in the latest +release from upstream. We remove that code. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <jslater@windriver.com> + +--- + scripts/Dpkg/Arch.pm | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm +index 1720847b8..6345ce3b9 100644 +--- a/scripts/Dpkg/Arch.pm ++++ b/scripts/Dpkg/Arch.pm +@@ -323,9 +323,6 @@ sub _load_tupletable() + (my $dt = $debtuple) =~ s/<cpu>/$_cpu/; + (my $da = $debarch) =~ s/<cpu>/$_cpu/; + +- next if exists $debarch_to_debtuple{$da} +- or exists $debtuple_to_debarch{$dt}; +- + $debarch_to_debtuple{$da} = $dt; + $debtuple_to_debarch{$dt} = $da; + } +-- +2.11.0 diff --git a/app-arch/dpkg/metadata.xml b/app-arch/dpkg/metadata.xml index 829c5799bde9..9511a3ee6146 100644 --- a/app-arch/dpkg/metadata.xml +++ b/app-arch/dpkg/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="libmd">Use <pkg>app-crypt/libmd</pkg> library for message digest functions</flag> <flag name="update-alternatives">Install update-alternatives</flag> diff --git a/app-arch/drpm/Manifest b/app-arch/drpm/Manifest new file mode 100644 index 000000000000..63017e871b0f --- /dev/null +++ b/app-arch/drpm/Manifest @@ -0,0 +1 @@ +DIST drpm-0.5.2.tar.gz 138930 BLAKE2B b2d57e35bf62e94ba23212518a57c22a5638c270a38b07e77799e4c054e82391a08bd40a34adb78e5e5a9cf6c895895146b3619c953a1f0d312a8790652fda55 SHA512 591ffb6b28b1d4c6dda25746a76563c0fa15f48368e2593dbd00a2652dea78b635c8e28f6e50cf824450d9938652ddf3712c877135d66a7b762f1223b38e9ab4 diff --git a/app-arch/drpm/drpm-0.5.2.ebuild b/app-arch/drpm/drpm-0.5.2.ebuild new file mode 100644 index 000000000000..737011a8cc67 --- /dev/null +++ b/app-arch/drpm/drpm-0.5.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A library for making, reading and applying deltarpm packages" +HOMEPAGE="https://github.com/rpm-software-management/drpm" +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rpm-software-management/drpm/" +else + SRC_URI="https://github.com/rpm-software-management/drpm/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" + +IUSE="lzip test zstd" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/bzip2:= + app-arch/rpm + app-arch/xz-utils + dev-libs/openssl:= + sys-libs/zlib + lzip? ( app-arch/lzlib ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND} + test? ( dev-util/cmocka ) +" + +src_configure() { + local mycmakeargs=( + -DHAVE_LZLIB_DEVEL=$(usex lzip ON OFF) + -DWITH_ZSTD=$(usex zstd ON OFF) + -DENABLE_TESTS=$(usex test ON OFF) + ) + + cmake_src_configure +} diff --git a/app-arch/drpm/drpm-9999.ebuild b/app-arch/drpm/drpm-9999.ebuild new file mode 100644 index 000000000000..737011a8cc67 --- /dev/null +++ b/app-arch/drpm/drpm-9999.ebuild @@ -0,0 +1,46 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A library for making, reading and applying deltarpm packages" +HOMEPAGE="https://github.com/rpm-software-management/drpm" +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rpm-software-management/drpm/" +else + SRC_URI="https://github.com/rpm-software-management/drpm/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" + +IUSE="lzip test zstd" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/bzip2:= + app-arch/rpm + app-arch/xz-utils + dev-libs/openssl:= + sys-libs/zlib + lzip? ( app-arch/lzlib ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND} + test? ( dev-util/cmocka ) +" + +src_configure() { + local mycmakeargs=( + -DHAVE_LZLIB_DEVEL=$(usex lzip ON OFF) + -DWITH_ZSTD=$(usex zstd ON OFF) + -DENABLE_TESTS=$(usex test ON OFF) + ) + + cmake_src_configure +} diff --git a/app-arch/drpm/metadata.xml b/app-arch/drpm/metadata.xml new file mode 100644 index 000000000000..ebbca5189fad --- /dev/null +++ b/app-arch/drpm/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>kangie@gentoo.org</email> + <name>Matt Jolly</name> + </maintainer> + <upstream> + <remote-id type="github">rpm-software-management/drpm</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-arch/dtrx/Manifest b/app-arch/dtrx/Manifest new file mode 100644 index 000000000000..b257f06a52bb --- /dev/null +++ b/app-arch/dtrx/Manifest @@ -0,0 +1 @@ +DIST dtrx-8.5.3.tar.gz 34147 BLAKE2B 156d2305f777b63870490736fd769a9d480f390d41ac0aa6acac16d4c5b21bb5b3f88d7b2cea6ecbf74511895bb3c3d923a6186d5189ebf3f7a5f4bb5db6c0f1 SHA512 0c29f0d9ca03d11206297669c20c3443c420db4aa0d91da54a5f6ac7236120af04a1a8d7e2e4f85b3d7e6c6050786cc0293bab02f424fe3be52a40f069d397be diff --git a/app-arch/dtrx/dtrx-8.5.3-r1.ebuild b/app-arch/dtrx/dtrx-8.5.3-r1.ebuild new file mode 100644 index 000000000000..7a6ccf0a7793 --- /dev/null +++ b/app-arch/dtrx/dtrx-8.5.3-r1.ebuild @@ -0,0 +1,57 @@ +# 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 optfeature + +DESCRIPTION="Do The Right eXtraction - extracts archives of different formats" +HOMEPAGE="https://github.com/dtrx-py/dtrx/ + https://pypi.org/project/dtrx/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}-py/${PN}.git" +else + inherit pypi + KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" + +DOCS=( README.md ) + +src_prepare() { + sed -i '/ *platform==/s|.*||' setup.cfg || die # bug #894148 + + distutils-r1_src_prepare +} + +pkg_postinst() { + local supported_format + local -a supported_formats=( + arj + bzip2 + cpio + gzip + lrzip + lzip + p7zip + rpm + unrar + unzip + xz-utils + zip + zstd + ) + + for supported_format in ${supported_formats[@]}; do + optfeature \ + "extraction of supported archives using ${supported_format}" \ + app-arch/${supported_format} + done +} diff --git a/app-arch/dtrx/dtrx-9999.ebuild b/app-arch/dtrx/dtrx-9999.ebuild new file mode 100644 index 000000000000..efeeace6e9ef --- /dev/null +++ b/app-arch/dtrx/dtrx-9999.ebuild @@ -0,0 +1,57 @@ +# 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 optfeature + +DESCRIPTION="Do The Right eXtraction - extracts archives of different formats" +HOMEPAGE="https://github.com/dtrx-py/dtrx/ + https://pypi.org/project/dtrx/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}-py/${PN}.git" +else + inherit pypi + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" + +DOCS=( README.md ) + +src_prepare() { + sed -i '/ *platform==/s|.*||' setup.cfg || die # bug #894148 + + distutils-r1_src_prepare +} + +pkg_postinst() { + local supported_format + local -a supported_formats=( + arj + bzip2 + cpio + gzip + lrzip + lzip + p7zip + rpm + unrar + unzip + xz-utils + zip + zstd + ) + + for supported_format in ${supported_formats[@]}; do + optfeature \ + "extraction of supported archives using ${supported_format}" \ + app-arch/${supported_format} + done +} diff --git a/app-arch/dtrx/metadata.xml b/app-arch/dtrx/metadata.xml new file mode 100644 index 000000000000..ed325e58479b --- /dev/null +++ b/app-arch/dtrx/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/dtrx-py/dtrx/issues/</bugs-to> + <remote-id type="github">dtrx-py/dtrx</remote-id> + <remote-id type="pypi">dtrx</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-arch/dump/dump-0.4.47-r2.ebuild b/app-arch/dump/dump-0.4.47-r2.ebuild new file mode 100644 index 000000000000..2f42c5dfca0d --- /dev/null +++ b/app-arch/dump/dump-0.4.47-r2.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit readme.gentoo-r1 + +MY_P="${PN}-$(ver_rs 2 b)" + +DESCRIPTION="Dump/restore ext2fs backup utilities" +HOMEPAGE="https://dump.sourceforge.io/" +SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" +# We keep uuid USE flag default dsiabled for this version. Don't forget +# to default enable it for later versions as this is the upstream default. +IUSE="bzip2 debug ermt lzo readline selinux sqlite ssl static test uuid zlib" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + ermt? ( ssl ) + ssl? ( zlib ) + test? ( sqlite? ( uuid ) )" + +RDEPEND=" + >=sys-fs/e2fsprogs-1.27:= + sys-apps/util-linux + bzip2? ( + app-arch/bzip2:= + static? ( app-arch/bzip2[static-libs] ) + ) + zlib? ( >=sys-libs/zlib-1.1.4:= ) + lzo? ( + dev-libs/lzo:2= + static? ( dev-libs/lzo:2[static-libs] ) + ) + sqlite? ( dev-db/sqlite:3= ) + ermt? ( dev-libs/openssl:0= ) + ssl? ( dev-libs/openssl:0= ) + readline? ( + sys-libs/readline:0= + sys-libs/ncurses:= + static? ( sys-libs/ncurses:=[static-libs] ) + )" +DEPEND="${RDEPEND} + virtual/os-headers" +BDEPEND="virtual/pkgconfig" + +src_configure() { + local myeconfargs=( + --with-dumpdatespath=/etc/dumpdates + --with-rmtpath='$(sbindir)/rmt' + --enable-blkid + $(use_enable bzip2) + $(use_enable debug) + $(use_enable ermt) + $(use_enable lzo) + $(use_enable readline) + $(use_enable selinux) + $(use_enable sqlite) + $(use_enable ssl) + $(use_enable static static-progs) + $(use_enable uuid) + $(use_enable zlib) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + mv "${ED}"/usr/sbin/{,dump-}rmt || die + mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die + use ermt && newsbin rmt/ermt dump-ermt + + dodoc KNOWNBUGS MAINTAINERS REPORTING-BUGS + dodoc -r examples + + # Don't install pre-compressed files + gunzip "${ED}"/usr/share/doc/${PF}/examples/cron_dump_to_disk/backupskel.tar.gz \ + || die + + local DOC_CONTENTS="dump has serious bugs + (see https://sourceforge.net/p/dump/bugs/162/ and + https://sourceforge.net/p/dump/bugs/174/). This tool should only + be used for restoring old backups, not for creating new ones. + \n\n${CATEGORY}/${PN} installs 'rmt' as 'dump-rmt'. + This is to avoid conflicts with app-arch/tar 'rmt'." + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/app-arch/dump/dump-0.4.47-r3.ebuild b/app-arch/dump/dump-0.4.47-r3.ebuild new file mode 100644 index 000000000000..ea26f905f91f --- /dev/null +++ b/app-arch/dump/dump-0.4.47-r3.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic readme.gentoo-r1 + +MY_P="${PN}-$(ver_rs 2 b)" + +DESCRIPTION="Dump/restore ext2fs backup utilities" +HOMEPAGE="https://dump.sourceforge.io/" +SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86" +# We keep uuid USE flag default dsiabled for this version. Don't forget +# to default enable it for later versions as this is the upstream default. +IUSE="bzip2 debug ermt lzo readline selinux sqlite ssl static test uuid zlib" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + ermt? ( ssl ) + ssl? ( zlib ) + test? ( sqlite? ( uuid ) )" + +RDEPEND=" + >=sys-fs/e2fsprogs-1.27:= + sys-apps/util-linux + bzip2? ( + app-arch/bzip2:= + static? ( app-arch/bzip2[static-libs] ) + ) + zlib? ( >=sys-libs/zlib-1.1.4:= ) + lzo? ( + dev-libs/lzo:2= + static? ( dev-libs/lzo:2[static-libs] ) + ) + sqlite? ( dev-db/sqlite:3= ) + ermt? ( dev-libs/openssl:0= ) + ssl? ( dev-libs/openssl:0= ) + readline? ( + sys-libs/readline:0= + sys-libs/ncurses:= + static? ( sys-libs/ncurses:=[static-libs] ) + )" +DEPEND="${RDEPEND} + virtual/os-headers" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-fix-incompatible-pointer-to-integer-conversion.patch +) + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/854204 + # + # Abandoned upstream for 3 years. Known corruptions reported in + # pkg_postinst. Sourceforge software. Not bothering to report a bug... + filter-lto + + local myeconfargs=( + --with-dumpdatespath=/etc/dumpdates + --with-rmtpath='$(sbindir)/rmt' + --enable-blkid + $(use_enable bzip2) + $(use_enable debug) + $(use_enable ermt) + $(use_enable lzo) + $(use_enable readline) + $(use_enable selinux) + $(use_enable sqlite) + $(use_enable ssl) + $(use_enable static static-progs) + $(use_enable uuid) + $(use_enable zlib) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + mv "${ED}"/usr/sbin/{,dump-}rmt || die + mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die + use ermt && newsbin rmt/ermt dump-ermt + + dodoc KNOWNBUGS MAINTAINERS REPORTING-BUGS + dodoc -r examples + + # Don't install pre-compressed files + gunzip "${ED}"/usr/share/doc/${PF}/examples/cron_dump_to_disk/backupskel.tar.gz \ + || die + + local DOC_CONTENTS="dump has serious bugs + (see https://sourceforge.net/p/dump/bugs/162/ and + https://sourceforge.net/p/dump/bugs/174/). This tool should only + be used for restoring old backups, not for creating new ones. + \n\n${CATEGORY}/${PN} installs 'rmt' as 'dump-rmt'. + This is to avoid conflicts with app-arch/tar 'rmt'." + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/app-arch/dump/files/dump-fix-incompatible-pointer-to-integer-conversion.patch b/app-arch/dump/files/dump-fix-incompatible-pointer-to-integer-conversion.patch new file mode 100644 index 000000000000..220e37bb7f57 --- /dev/null +++ b/app-arch/dump/files/dump-fix-incompatible-pointer-to-integer-conversion.patch @@ -0,0 +1,25 @@ +From: listout <listout@protonmail.com> +Date: Mon, 17 Apr 2023 12:36:40 +0530 +Subject: [PATCH] Fix incompatible pointer to integer conversion + +transformation_null was initializing one of it's elements with NULL +which is zero type casted to void. Hence, instead of initializing with +NULL, now we are initializing that element with zero. + +Refer: https://bugs.gentoo.org/874675 + +Signed-off-by: listout <listout@protonmail.com> +--- a/common/transformation_null.c ++++ b/common/transformation_null.c +@@ -81,7 +81,7 @@ null_decompress(Transformation *xform, struct tapebuf *tpbin, unsigned long *des + Transformation transformation_null = + { + 0, +- NULL, ++ 0, + "null", + 0, + &null_initialize, +-- +2.39.2 + diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest index f0088d97f1eb..1a705f21bf13 100644 --- a/app-arch/engrampa/Manifest +++ b/app-arch/engrampa/Manifest @@ -1 +1,3 @@ -DIST engrampa-1.26.0.tar.xz 1761596 BLAKE2B c72def523f6589ab97351568e0562898d996e640ffefa66f32096e5a0ad97ad0b05b21ebdcc16ba1f75d9b75a444f8ed4ed492a412cc16c018e65135a88f3398 SHA512 8058627af19744d26f0997fca37a9a1d9902c63e4008e1af44b2a3b15ebc03e27f2018c60351ee503a28aa072836d201625074abb838e0a95071ce65c64a52bc +DIST engrampa-1.26.1.tar.xz 1792452 BLAKE2B ff87f21848919654a2392c02e6050ac0b4c80308361ec7c829a2acf3fb25b088e164a3722be0312b2c814022bf0e06c80ae0796add182e6ac8e5d696409c5afe SHA512 6e3e59503d3d55df3eddc63f5f8f67c80a84b2b602801f9bcbaf4e38b6e991fffaa879e1cd44c1173b5c11096587122438bda51401c2694654c99b87a52b9f5e +DIST engrampa-1.26.2.tar.xz 1790984 BLAKE2B a3812240947f3bdc39845852a69d90c660f9ca3b03b167a5fbe1373024827b1abac93f3dc854316ae0368717cf7aef2512b84f47b93453a3a49a64c99ae3865a SHA512 4e9a55d9bc834616d8a8f5b7b0882fd4581ad2efdade33367ede85800ebb1e70241d20c9c37fadbef468d16088419fcf85daec0718c68bdbefe2301f8b0b40a3 +DIST engrampa-1.28.1.tar.xz 1720164 BLAKE2B a2776cbf7040bcb7baf992caa323afaabffe316ad94a222613cc8bc8c59490f389005ecdec66de519c88f2ad89167739b3934c2bed6c212846b20f6b4b60a6ae SHA512 912bec0e1b2bf8f79e89bda4cb72e28a96d4d1b2ab32fca14b3d28bf75be93cdd4a9e43315fe6ad2c8cac5af95686915cfa3d0a3182973a8b6e42817cfdd936f diff --git a/app-arch/engrampa/engrampa-1.26.0.ebuild b/app-arch/engrampa/engrampa-1.26.1.ebuild index 82d52bffe28c..f4f1aded41e1 100644 --- a/app-arch/engrampa/engrampa-1.26.0.ebuild +++ b/app-arch/engrampa/engrampa-1.26.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git" @@ -42,6 +42,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-1.26.0-clang16.patch +) + src_configure() { mate_src_configure \ --disable-run-in-place \ @@ -56,7 +60,7 @@ pkg_postinst() { optfeature "Support for 7-zip" app-arch/p7zip optfeature "Support for ace" app-arch/unace optfeature "Support for arj" app-arch/arj - optfeature "Support for cpio" app-arch/cpio + optfeature "Support for cpio" app-alternatives/cpio optfeature "Support for deb" app-arch/dpkg optfeature "Support for iso" app-cdr/cdrtools optfeature "Support for jar,zip" app-arch/zip app-arch/unzip diff --git a/app-arch/engrampa/engrampa-1.26.2.ebuild b/app-arch/engrampa/engrampa-1.26.2.ebuild new file mode 100644 index 000000000000..da1636e52756 --- /dev/null +++ b/app-arch/engrampa/engrampa-1.26.2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/mate-desktop/${PN}/archive/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +fi + +inherit mate optfeature + +DESCRIPTION="Engrampa archive manager for MATE" +HOMEPAGE="https://mate-desktop.org/ https://github.com/mate-desktop/engrampa" + +LICENSE="FDL-1.1+ GPL-2+ LGPL-2+" +SLOT="0" +IUSE="caja magic" + +DEPEND=" + >=dev-libs/glib-2.50:2 + >=dev-libs/json-glib-0.14 + virtual/libintl + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3[X] + x11-libs/libSM + x11-libs/pango + caja? ( >=mate-base/caja-1.17.1 ) + magic? ( sys-apps/file ) +" +RDEPEND=" + ${DEPEND} + virtual/libintl +" +BDEPEND=" + app-text/yelp-tools + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.26.0-clang16.patch +) + +src_configure() { + mate_src_configure \ + --disable-run-in-place \ + $(use_enable caja caja-actions) \ + $(use_enable magic) \ + --disable-packagekit +} + +pkg_postinst() { + mate_pkg_postinst + + optfeature "Support for 7-zip" app-arch/p7zip + optfeature "Support for ace" app-arch/unace + optfeature "Support for arj" app-arch/arj + optfeature "Support for cpio" app-alternatives/cpio + optfeature "Support for deb" app-arch/dpkg + optfeature "Support for iso" app-cdr/cdrtools + optfeature "Support for jar,zip" app-arch/zip app-arch/unzip + optfeature "Support for lha" app-arch/lha + optfeature "Support for lzma" app-arch/xz-utils + optfeature "Support for lzop" app-arch/lzop + optfeature "Support for rar" app-arch/unrar + optfeature "Support for rpm" app-arch/rpm + optfeature "Support for unstuff" app-arch/stuffit + optfeature "Support for zoo" app-arch/zoo +} diff --git a/app-arch/engrampa/engrampa-1.28.1.ebuild b/app-arch/engrampa/engrampa-1.28.1.ebuild new file mode 100644 index 000000000000..f0fa99ba4f21 --- /dev/null +++ b/app-arch/engrampa/engrampa-1.28.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MINOR=$(($(ver_cut 2) % 2)) +if [[ ${MINOR} -eq 0 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +fi + +inherit mate optfeature + +DESCRIPTION="Engrampa archive manager for MATE" +HOMEPAGE="https://mate-desktop.org/ https://github.com/mate-desktop/engrampa" + +LICENSE="FDL-1.1+ GPL-2+ LGPL-2+" +SLOT="0" +IUSE="caja magic" + +DEPEND=" + >=dev-libs/glib-2.50:2 + >=dev-libs/json-glib-0.14 + virtual/libintl + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3[X] + x11-libs/libSM + x11-libs/pango + caja? ( >=mate-base/caja-1.17.1 ) + magic? ( >=sys-apps/file-5.38 ) +" +RDEPEND=" + ${DEPEND} + virtual/libintl +" +BDEPEND=" + app-text/yelp-tools + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + mate_src_configure \ + --disable-run-in-place \ + $(use_enable caja caja-actions) \ + $(use_enable magic) \ + --disable-packagekit +} + +pkg_postinst() { + mate_pkg_postinst + + optfeature "Support for 7-zip" app-arch/p7zip + optfeature "Support for ace" app-arch/unace + optfeature "Support for arj" app-arch/arj + optfeature "Support for cpio" app-alternatives/cpio + optfeature "Support for deb" app-arch/dpkg + optfeature "Support for iso" app-cdr/cdrtools + optfeature "Support for jar,zip" app-arch/zip app-arch/unzip + optfeature "Support for lha" app-arch/lha + optfeature "Support for lzma" app-arch/xz-utils + optfeature "Support for lzop" app-arch/lzop + optfeature "Support for rar" app-arch/unrar + optfeature "Support for rpm" app-arch/rpm + optfeature "Support for unstuff" app-arch/stuffit + optfeature "Support for zoo" app-arch/zoo +} diff --git a/app-arch/engrampa/files/engrampa-1.26.0-clang16.patch b/app-arch/engrampa/files/engrampa-1.26.0-clang16.patch new file mode 100644 index 000000000000..334987a40baf --- /dev/null +++ b/app-arch/engrampa/files/engrampa-1.26.0-clang16.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/875404 +https://github.com/mate-desktop/engrampa/pull/477 + +From f54425f1f994fc235c6cdd4013eb9fcf17da9f29 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Fri, 14 Apr 2023 22:35:08 +0200 +Subject: [PATCH] file-utils: Include <strings.h> for strcasecmp + +The _XOPEN_SOURCE macro definition overrides _DEFAULT_SOURCE +and disables the declaration in <string.h>. + +This avoids an implicit function declaration and build failures +with future compilers. +--- a/src/file-utils.c ++++ b/src/file-utils.c +@@ -27,6 +27,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <strings.h> + #include <ctype.h> + #include <time.h> + #include <unistd.h> + diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml index 7f54976734ca..9a73784dd824 100644 --- a/app-arch/engrampa/metadata.xml +++ b/app-arch/engrampa/metadata.xml @@ -1,9 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> + <maintainer type="person" proxied="yes"> + <email>oz.tiram@gmail.com</email> + <name>Oz Tiram</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>immoloism@gmail.com</email> + <name>Ian Jordan</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <use> <flag name="caja">Enable engrampa to integrate with diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest index 96a1cba9d1dd..52e6538bbc51 100644 --- a/app-arch/file-roller/Manifest +++ b/app-arch/file-roller/Manifest @@ -1 +1,2 @@ -DIST file-roller-43.0.tar.xz 894308 BLAKE2B 85bf73947e153a3b40507e524c35f8be98a08a9ce5916e24ef44559400d7d44e4e0fbd94de8b5638fd1da967ff007894011624ccf9ad8c3481cac63aba3da6e5 SHA512 dff3d9ef5c96e5957fb4ca146072b5fdf0309299d0b1a4ab6db55e24a0652b52ba45915121db4d59d9b1ab60b4c3c64bbb56799a46a0eac5609236f4e1251837 +DIST file-roller-44.1.tar.xz 927156 BLAKE2B 60ced1711298989eda90a675095b5e7b8f1e9b84b5f4cf364bce4683ba9eac6a8a4a1857b0248cd9a49ea2161cbc5c2c36df94ebc164e195de528ba50220d1da SHA512 de0d0ce93ecba822ec495227cd484cb164a81f8b5349033d80207acc19584985f0c88bfa766a46468349e2b16b020371e2e6b73b4fb7f2f18f40f115f2391b30 +DIST file-roller-44.tar.xz 924236 BLAKE2B 12eebd312afdec8f87141d384d1476be7296073f911791328158af1ab93fcb4092ee79e0c65743c36eaa28e06b5b59503357b6c4cff87b4896d3969a67d08e45 SHA512 d40ac036161397828ded2bab7bdf1c029ef0b53fad65e0922e6eeec40442eb7a9898a7d5c3208f6dfda3ad6f51b0771f248ab64c177769b655493a44c403f824 diff --git a/app-arch/file-roller/file-roller-44.1.ebuild b/app-arch/file-roller/file-roller-44.1.ebuild new file mode 100644 index 000000000000..6b9c0f7cfa2c --- /dev/null +++ b/app-arch/file-roller/file-roller-44.1.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/file-roller/file-roller-43.0.ebuild b/app-arch/file-roller/file-roller-44.ebuild index 713cd20e4b96..dcb5b5610d53 100644 --- a/app-arch/file-roller/file-roller-43.0.ebuild +++ b/app-arch/file-roller/file-roller-44.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller" LICENSE="GPL-2+ CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="gtk-doc +introspection nautilus" REQUIRED_USE="gtk-doc? ( introspection )" @@ -19,8 +19,8 @@ REQUIRED_USE="gtk-doc? ( introspection )" # pango used in fr-window RDEPEND=" >=dev-libs/glib-2.38:2 - >=x11-libs/gtk+-3.22.0:3 - >=gui-libs/libhandy-1.5.0:1 + >=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:= @@ -47,7 +47,7 @@ and install the relevant package. For example: ace - app-arch/unace arj - app-arch/arj brotli - app-arch/brotli -cpio - app-arch/cpio +cpio - app-alternatives/cpio deb - app-arch/dpkg iso - app-cdr/cdrtools jar,zip - app-arch/zip and app-arch/unzip diff --git a/app-arch/file-roller/files/3.36-packages.match b/app-arch/file-roller/files/3.36-packages.match index b494f5430a00..c84d4517a59b 100644 --- a/app-arch/file-roller/files/3.36-packages.match +++ b/app-arch/file-roller/files/3.36-packages.match @@ -3,7 +3,7 @@ arj=app-arch/arj binutils=sys-devel/binutils brotli=app-arch/brotli bzip2=app-arch/bzip2 -cpio=app-arch/cpio +cpio=app-alternatives/cpio dpkg=app-arch/dpkg genisoimage=app-cdr/cdrtools gzip=app-arch/gzip diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest index 25b4db0b8542..52c80cbf9c84 100644 --- a/app-arch/gcab/Manifest +++ b/app-arch/gcab/Manifest @@ -1 +1 @@ -DIST gcab-1.5.tar.xz 81728 BLAKE2B ba1793a8374e2dac412ca2807343781013f5be8d79e444ef0a136fbf903dd9a47809b3dec4703ebd19d196a7046a0c8405ae8463c2f7338fdc5eaf979436e8e1 SHA512 2a9b7d2720abbb5527d478ac760898ae254d08b7aa929fbb21753296e5a07c51d62e134a3f8b1b21d9b557d4093505194e09823ddbaf58465d37b372f37534b7 +DIST gcab-1.6.tar.xz 82088 BLAKE2B 04e78229649f1c5cee8d9a9a52e6489264a0356fd21830b71f09c7a22ac73a91ae721f5a99bedbe7556265c1bdd134b3500aad580407c31b0aac487ef1810bf8 SHA512 26b8dcf47ba98e7cc073a551d1c965c13a72d298c8a4e124823bdbb20fe314c8f687232df9ae824a54d81f96fe7d9ac1a40aed24e51f8706595079cec2c61fc9 diff --git a/app-arch/gcab/files/1.5-meson-git-version-is-optional.patch b/app-arch/gcab/files/1.5-meson-git-version-is-optional.patch deleted file mode 100644 index 6bfbaecf78a6..000000000000 --- a/app-arch/gcab/files/1.5-meson-git-version-is-optional.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ad0baea50359c1978a9224ee60bf98d97bfb991f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com> -Date: Fri, 5 Aug 2022 11:13:41 +0400 -Subject: [PATCH] meson: git version is optional -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -My bad, git may be present, but running "git abbrev" from the tarball -extracted project can fail. - -Fix commit a755e2ae77035aad9644adadaec5ecf15e9656ba ("meson: fix new -warning about run_command()") - -Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 15fd5cd..5eba715 100644 ---- a/meson.build -+++ b/meson.build -@@ -8,7 +8,7 @@ project('gcab', 'c', - git_version = [] - git = find_program('git', required: false) - if git.found() -- git_version = run_command(git, 'describe', '--abbrev=4', '--dirty', check: true).stdout().strip().split('-') -+ git_version = run_command(git, 'describe', '--abbrev=4', '--dirty', check: false).stdout().strip().split('-') - endif - - # libtool versioning --- -2.35.1 - diff --git a/app-arch/gcab/gcab-1.5.ebuild b/app-arch/gcab/gcab-1.6.ebuild index 8cb66f2e3206..c97807f55159 100644 --- a/app-arch/gcab/gcab-1.5.ebuild +++ b/app-arch/gcab/gcab-1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,10 +33,6 @@ BDEPEND=" vala? ( $(vala_depend) ) " -PATCHES=( - "${FILESDIR}"/${PV}-meson-git-version-is-optional.patch -) - src_prepare() { default xdg_environment_reset diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest index aaf4a60f055b..1e2bed18fb1e 100644 --- a/app-arch/gnome-autoar/Manifest +++ b/app-arch/gnome-autoar/Manifest @@ -1 +1 @@ -DIST gnome-autoar-0.4.3.tar.xz 50860 BLAKE2B ab7360d422e3f2d06cc00d765c203e6472a50d8cd9c220cc87b6fc40ca9bdfc3677a2a7d50b383b8f195bba1ffe72773b23773f703cbd24e5768f0f907790e10 SHA512 9f1ba584c4fc8e82d842fb21d3a113d64faa85f8f27cb7afb5d09919f510e350608b6a4e2f3ac527162ab338d008271bd430fb5b8ead265098c1810ffcbcef30 +DIST gnome-autoar-0.4.4.tar.xz 51300 BLAKE2B db3390f771205166aaf9b6a90da15bd68c80ad5e874cc7ddc14b2a79d4dc2b3d41b9636acd6f44e4a6ce3590c3659c51cd8a910ab4e588aba41cdc7dbcf72725 SHA512 c38d3703e61d7338b97c362127bdc61f77d259eecd662f3963f28bfcb1ce7be8a948e9a57e79a8181a55dfc3635f671f2160ade947a1b5122204a2dc0025682d diff --git a/app-arch/gnome-autoar/gnome-autoar-0.4.3.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.4.4.ebuild index 32bfc025c607..b9065f4e4615 100644 --- a/app-arch/gnome-autoar/gnome-autoar-0.4.3.ebuild +++ b/app-arch/gnome-autoar/gnome-autoar-0.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ RESTRICT="!test? ( test )" KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" RDEPEND=" - >=app-arch/libarchive-3.4.0 + >=app-arch/libarchive-3.4.0:= >=dev-libs/glib-2.35.6:2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) diff --git a/app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild b/app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild index 8cfa2563d8f8..6aefd867f9c7 100644 --- a/app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild +++ b/app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Split files into smaller pieces and combine them back together" -HOMEPAGE="http://gtk-splitter.sourceforge.net" +HOMEPAGE="https://gtk-splitter.sourceforge.net" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" diff --git a/app-arch/gxz/Manifest b/app-arch/gxz/Manifest new file mode 100644 index 000000000000..3fac29d8d583 --- /dev/null +++ b/app-arch/gxz/Manifest @@ -0,0 +1 @@ +DIST gxz-0.5.12.tar.gz 4176087 BLAKE2B 0bf4795ec1d008ef956d42d9d78b3f3f65bb9555436c64869a82aa6c058ac3aa5e8912a8e451cdafccaeaf4d9bb30404e2cd60a00f620baf01e6b6d892d59a3f SHA512 13928dfbd8514eb7c778a84405ba2342159da8f59783f82b5774643190b12d5fc1aed927b67946d5ef246d5cc61b3be23eaa08695c61aea70229617b1ce757ff diff --git a/app-arch/gxz/gxz-0.5.12.ebuild b/app-arch/gxz/gxz-0.5.12.ebuild new file mode 100644 index 000000000000..5413b88e41b4 --- /dev/null +++ b/app-arch/gxz/gxz-0.5.12.ebuild @@ -0,0 +1,28 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Pure golang package for reading and writing xz-compressed files" +HOMEPAGE="https://github.com/ulikunitz/xz" +SRC_URI="https://github.com/ulikunitz/xz/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/xz-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +src_compile() { + ego build ./cmd/gxz +} + +src_test() { + # TODO: Need to give it test data? + ego test ./cmd/gxz +} + +src_install() { + dobin gxz +} diff --git a/app-arch/gxz/metadata.xml b/app-arch/gxz/metadata.xml new file mode 100644 index 000000000000..dbf55dc84298 --- /dev/null +++ b/app-arch/gxz/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <upstream> + <remote-id type="github">ulikunitz/xz</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest index 670e486ce3fe..694ed8bba701 100644 --- a/app-arch/gzip/Manifest +++ b/app-arch/gzip/Manifest @@ -1,4 +1,2 @@ -DIST gzip-1.12.tar.xz 825548 BLAKE2B 7e2d482c08555f5fb0ff5408c0afe48c61034e9779eed6e3dd8046c847234c0a8a6bc34d49a934a54db0d73033e12c71a228d373551384a4cd663315071637e0 SHA512 116326fe991828227de150336a0c016f4fe932dfbb728a16b4a84965256d9929574a4f5cfaf3cf6bb4154972ef0d110f26ab472c93e62ec9a5fd7a5d65abea24 -DIST gzip-1.12.tar.xz.sig 833 BLAKE2B ab7b4a759ef163d67f20773607ba0408ea9f1f7c7c224f43635fc3752acc521b74dbea4ec9ebb58a2f4fa13ecae19e00779b4b56c2cb95976301445beff817aa SHA512 1f4702797f7c5f1873c2f9c2f6210ba23824455d17ee82f50f0bf24240ed5bdf0090cf85338ccf76ba82422f8b4ad3a329d8bbf1350cb094d7bd61aa45550397 -DIST gzip-1.12_p20221228.tar.xz 806448 BLAKE2B 278eb44caca7ee16ca5d0210673726a1daebef6da7eaf0a87fc24590cb4c53d4ebe2decb6b8975440e1eb2c2cfebb69f091c658f9a7430a1717f0477fec279da SHA512 87d1fccb9603ec336c89689337e3cf3cfef70054ab4416bd8380fee011e9f517555d80a2a009bd312a58c34fdaf48778e5f0e9bea350ae280b440a325a837866 -DIST gzip-1.12_p20221228.tar.xz.sig 833 BLAKE2B b59d4677d15e2461d5fa95b4d53e94914e14cad613a9766aa3e51bfcece84ec0c4dd752c0d124cb76cc2240f9460f809c5bbbab958522c795e94026c8d4206ef SHA512 09a3a6687c80d7ec7e97ebd4c679e4d162729232d77966352c2f7ddd45594d79039ff33a93592889137605412b18b7868ea19ba4f4d162a5912a3978b3d67dd2 +DIST gzip-1.13.tar.xz 838248 BLAKE2B f0e3b4c28bafcd3b59b65ac2d71218dc58d81b52c6921c1be038757c99e99184178c5d0e9674caa5099713b8b64e8c85cf061f4abfa20b73b478288f121fb05d SHA512 e3d4d4aa4b2e53fdad980620307257c91dfbbc40bcec9baa8d4e85e8327f55e2ece552c9baf209df7b66a07103ab92d4954ac53c86c57fbde5e1dd461143f94c +DIST gzip-1.13.tar.xz.sig 833 BLAKE2B 42e38fa7b3a6b6d21a18308cf662844ed84e1a142a945f3f3142db0a14212c0e642de514abb1307ec12ee7bb9644472cc3aed40582d9c266ab24808acbca0215 SHA512 f95e016f61f4a67cb4cec6cede2510af6bb5567d72bbd3d70210a6d5cf3ee5fea8f0cbf8f7b612fa52f2ecfd9dba050d9cd4494075ce5ac4abac7b74eaa7ccbc diff --git a/app-arch/gzip/gzip-1.12-r4.ebuild b/app-arch/gzip/gzip-1.12-r4.ebuild deleted file mode 100644 index acc085235bb1..000000000000 --- a/app-arch/gzip/gzip-1.12-r4.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gzip.asc -inherit flag-o-matic verify-sig - -DESCRIPTION="Standard GNU compressor" -HOMEPAGE="https://www.gnu.org/software/gzip/" -SRC_URI="mirror://gnu/gzip/${P}.tar.xz - https://alpha.gnu.org/gnu/gzip/${P}.tar.xz" -SRC_URI+=" verify-sig? ( - mirror://gnu/gzip/${P}.tar.xz.sig - https://alpha.gnu.org/gnu/gzip/${P}.tar.xz.sig - )" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="pic static" - -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )" -RDEPEND="!app-arch/pigz[symlink(-)]" -PDEPEND=" - app-alternatives/gzip -" - -PATCHES=( - "${FILESDIR}/${PN}-1.3.8-install-symlinks.patch" -) - -src_configure() { - use static && append-flags -static - - # Avoid text relocation in gzip - use pic && export DEFS="NO_ASM" - - # bug #663928 - econf --disable-gcc-warnings -} - -src_install() { - default - - docinto txt - dodoc algorithm.doc gzip.doc - - # Avoid conflict with app-arch/ncompress - rm "${ED}"/usr/bin/uncompress || die - - # keep most things in /usr, just the fun stuff in / - # also rename them to avoid conflict with app-alternatives/gzip - dodir /bin - local x - for x in gunzip gzip zcat; do - mv "${ED}/usr/bin/${x}" "${ED}/bin/${x}-reference" || die - done - mv "${ED}"/usr/share/man/man1/gzip{,-reference}.1 || die - rm "${ED}"/usr/share/man/man1/{gunzip,zcat}.1 || die -} - -pkg_postinst() { - if [[ -n ${REPLACING_VERSIONS} ]]; then - local ver - for ver in ${REPLACING_VERSIONS}; do - if ver_test "${ver}" -lt "1.12-r2"; then - ewarn "This package no longer installs 'uncompress'." - ewarn "Please use 'gzip -d' to decompress .Z files." - fi - done - fi - - # ensure to preserve the symlinks before app-alternatives/gzip - # is installed - local x - for x in gunzip gzip zcat; do - if [[ ! -h ${EROOT}/bin/${x} ]]; then - ln -s "${x}-reference" "${EROOT}/bin/${x}" || die - fi - done -} diff --git a/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild b/app-arch/gzip/gzip-1.13.ebuild index 23e799f74e59..a864a1774f32 100644 --- a/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild +++ b/app-arch/gzip/gzip-1.13.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gzip.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gzip.asc inherit flag-o-matic verify-sig DESCRIPTION="Standard GNU compressor" @@ -31,7 +31,7 @@ fi LICENSE="GPL-3+" SLOT="0" if [[ ${PV} != *_p* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 IUSE="pic static" diff --git a/app-arch/gzip/metadata.xml b/app-arch/gzip/metadata.xml index 32eb6dd3de53..d01e5bd7a1eb 100644 --- a/app-arch/gzip/metadata.xml +++ b/app-arch/gzip/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -<upstream> - <remote-id type="cpe">cpe:/a:gnu:gzip</remote-id> -</upstream> -<use> -<flag name="pic">disable optimized assembly code that is not PIC friendly</flag> -</use> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:gnu:gzip</remote-id> + <remote-id type="savannah">gzip</remote-id> + </upstream> + <use> + <flag name="pic">disable optimized assembly code that is not PIC friendly</flag> + </use> </pkgmetadata> diff --git a/app-arch/hardlink/hardlink-0.3.2.ebuild b/app-arch/hardlink/hardlink-0.3.2.ebuild index 41e4ede3f061..e8474e2e6476 100644 --- a/app-arch/hardlink/hardlink-0.3.2.ebuild +++ b/app-arch/hardlink/hardlink-0.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -DOCS=( README ${T}/README.rsync ) +DOCS=( README "${T}"/README.rsync ) src_prepare() { default diff --git a/app-arch/hardlink/metadata.xml b/app-arch/hardlink/metadata.xml index 737247bb16ae..f409a4f8d262 100644 --- a/app-arch/hardlink/metadata.xml +++ b/app-arch/hardlink/metadata.xml @@ -5,7 +5,7 @@ <email>robbat2@gentoo.org</email> <name>Robin H. Johnson</name> </maintainer> -<maintainer type="project"> + <maintainer type="project"> <email>shell-tools@gentoo.org</email> <name>Gentoo Shell Tools Project</name> </maintainer> diff --git a/app-arch/innoextract/files/innoextract-1.9-boost-1.85.0.patch b/app-arch/innoextract/files/innoextract-1.9-boost-1.85.0.patch new file mode 100644 index 000000000000..23e4554fc53e --- /dev/null +++ b/app-arch/innoextract/files/innoextract-1.9-boost-1.85.0.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/930495 +https://github.com/dscharrer/innoextract/pull/169 + +From 264c2fe6b84f90f6290c670e5f676660ec7b2387 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch> +Date: Thu, 28 Mar 2024 15:11:40 +0100 +Subject: [PATCH] Fix build with boost 1.85 + +As of boost 1.85-beta1, boost/filesystem/directory.hpp is no longer +implicitly included by boost/filesystem/operations.hpp. Include it +explicitly. +--- a/src/stream/slice.cpp ++++ b/src/stream/slice.cpp +@@ -27,6 +27,7 @@ + #include <boost/cstdint.hpp> + #include <boost/algorithm/string/predicate.hpp> + #include <boost/filesystem/operations.hpp> ++#include <boost/filesystem/directory.hpp> + #include <boost/range/size.hpp> + + #include "util/console.hpp" diff --git a/app-arch/innoextract/innoextract-1.9.ebuild b/app-arch/innoextract/innoextract-1.9.ebuild index aa28d63fc718..2259b5ffb6d3 100644 --- a/app-arch/innoextract/innoextract-1.9.ebuild +++ b/app-arch/innoextract/innoextract-1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://constexpr.org/innoextract/files/${P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~m68k ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~m68k ppc64 x86" IUSE="debug +iconv +lzma" RDEPEND=" @@ -22,6 +22,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${PN}-1.9-fix-linkage.patch" + "${FILESDIR}/${PN}-1.9-boost-1.85.0.patch" ) src_configure() { diff --git a/app-arch/lbzip2/files/lbzip2-2.5_p20181227-clang16-musl-info.patch b/app-arch/lbzip2/files/lbzip2-2.5_p20181227-clang16-musl-info.patch new file mode 100644 index 000000000000..cab651805476 --- /dev/null +++ b/app-arch/lbzip2/files/lbzip2-2.5_p20181227-clang16-musl-info.patch @@ -0,0 +1,21 @@ +Bug: https://bugs.gentoo.org/894320 +--- a/src/common.h ++++ b/src/common.h +@@ -35,6 +35,7 @@ + + /* Tracing, useful in debugging, but not officially supported. */ + #ifdef ENABLE_TRACING ++#include "main.h" /* Needed for info */ + #define Trace(x) info x + #else + #define Trace(x) +--- a/src/main.h ++++ b/src/main.h +@@ -20,6 +20,7 @@ + along with lbzip2. If not, see <http://www.gnu.org/licenses/>. + */ + ++#pragma once + #include <limits.h> /* CHAR_BIT */ + + #if 8 != CHAR_BIT diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227-r2.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r2.ebuild index 4272c9ad02b3..b92a6e2fff28 100644 --- a/app-arch/lbzip2/lbzip2-2.5_p20181227-r2.ebuild +++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r2.ebuild @@ -18,6 +18,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.3-s_isreg.patch "${FILESDIR}"/${P}-fix-unaligned.patch "${FILESDIR}"/${P}-clang16.patch + "${FILESDIR}"/${P}-clang16-musl-info.patch ) src_prepare() { diff --git a/app-arch/lcab/lcab-1.0_beta12.ebuild b/app-arch/lcab/lcab-1.0_beta12.ebuild index 27fe02473de4..03a23f05e503 100644 --- a/app-arch/lcab/lcab-1.0_beta12.ebuild +++ b/app-arch/lcab/lcab-1.0_beta12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="ftp://mirror.ohnopub.net/mirror/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" S="${WORKDIR}/${MY_P}" diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest index 13bdc1be59ab..76749a84e3db 100644 --- a/app-arch/lha/Manifest +++ b/app-arch/lha/Manifest @@ -1 +1,2 @@ DIST lha-114i_p20201004.tar.gz 220541 BLAKE2B 64268deb40de67d5f4888f7d4b4529fa1b6ca02c562bd041d9edd1ac9cc74ccfa43198c79310bd354806e3095f6aba8c97256b49686feb8c713e3d8110137103 SHA512 9a9337cbb6a3d71253597750301e37163c5b495e712f2374adf2ac0d19f731ed49482a3f8b639e4c48c7ef6fa7ed9f9081516d77548e9c88ed3b9ac037efeb06 +DIST lha-114i_p20210328.tar.gz 231115 BLAKE2B f9587fd2f99aa80498ed69f43efe189a6db12881c6ea748763e8ae071180a30578651db11cbba0216103f6a7741d37a0e55b2530a7e458046a7230f6101f05e7 SHA512 46fc722f9f15dbe75600c2aeecbf94357aa24da964bb03f8326d9d13affa2ea60d4ec5dd21a4f5014f2cbe4e06f4bb959aa8de89a5491e1600eafdd909b293d2 diff --git a/app-arch/lha/lha-114i_p20201004.ebuild b/app-arch/lha/lha-114i_p20201004.ebuild index 88831bf85bd4..971bf526c523 100644 --- a/app-arch/lha/lha-114i_p20201004.ebuild +++ b/app-arch/lha/lha-114i_p20201004.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,15 +26,6 @@ src_prepare() { eautoreconf } -src_configure() { - if [[ ${CHOST} == *-interix* ]]; then - export ac_cv_header_inttypes_h=no - export ac_cv_func_iconv=no - fi - - default -} - src_install() { default dodoc olddoc/ChangeLog Hacking_of_LHa diff --git a/app-arch/lha/lha-114i_p20210328.ebuild b/app-arch/lha/lha-114i_p20210328.ebuild new file mode 100644 index 000000000000..daaf8b6485d3 --- /dev/null +++ b/app-arch/lha/lha-114i_p20210328.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_COMMIT="26950220c9c7590fd603ecaa54a12a52371affed" + +DESCRIPTION="Utility for creating and opening lzh archives" +HOMEPAGE="https://github.com/jca02266/lha https://lha.osdn.jp" +SRC_URI="https://github.com/jca02266/lha/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="lha" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +S="${WORKDIR}/${PN}-${MY_COMMIT}" + +PATCHES=( + "${FILESDIR}"/${P/_p*}-file-list-from-stdin.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + dodoc olddoc/ChangeLog Hacking_of_LHa +} diff --git a/app-arch/lha/metadata.xml b/app-arch/lha/metadata.xml index 8d147b3c70f3..9840d61b592f 100644 --- a/app-arch/lha/metadata.xml +++ b/app-arch/lha/metadata.xml @@ -6,6 +6,7 @@ <name>James Le Cuirot</name> </maintainer> <upstream> + <remote-id type="github">jca02266/lha</remote-id> <remote-id type="osdn">lha</remote-id> </upstream> </pkgmetadata> diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest index 53eb2e77adcc..2baf43a36402 100644 --- a/app-arch/libarchive/Manifest +++ b/app-arch/libarchive/Manifest @@ -1,4 +1,6 @@ -DIST libarchive-3.6.1.tar.xz 5241148 BLAKE2B e7b79e97545dabeac164069e87adbd2081d3bd75c22f80b3797c6e487a477b3f6347b6fc14c76668eb69f2f2e5dcdd5a33a694e0a292ce426b8d0d93435218cf SHA512 2e5a72edc468080c0e8f29e07d9c33826ffb246fa040ec42399bedeecf698b7555f69ffd15057ad79c0f50cd4926d43174599d99632b1b99ec6cd159c43a70b8 -DIST libarchive-3.6.1.tar.xz.asc 833 BLAKE2B 8a1ca13491f3b29b322ab281a80eaef9ca2cca680e18a0ed5ff626e8808b6c9a5eb4cdd6eaf00fb771f361d84d7785c103a9a0665d812f1f27ac66f5d1a2e1da SHA512 0411a9bdc9bb058b289b5cc102a220216420bf01ea213e771a16246ed48e670f3426e8555bac27262b686b40b7b2239907c4eef2bf43d812d73a69ccb2a5b00c -DIST libarchive-3.6.2.tar.xz 5213196 BLAKE2B 355b5d402e352dee802513485ce7e047af58d6de5b9bf6a49f3fd8d7b94117007598820ac979585c0da79747e8b63b70ab151131182368a11f97a047cf9029d4 SHA512 a12bb6839e13a0be1099f42c650fc90fbfe62d32ce38bcbb4794206d29b2c782ae1115124d0e5f6b9716514213af32b05e4a42eb196447674a5f9a2a32bee043 -DIST libarchive-3.6.2.tar.xz.asc 659 BLAKE2B a4b0035ab2bda4129cdf0c99266cd1e5f4772d90de6e348c75958bc803f369d6abea85d9730c6c9a216466b35697faad8d265fb2c285545887eafde27d828887 SHA512 403e5f7dec14d8b1cc01fad5a249e7b7618a7b45bcb3361ea80d67d76b591b12ce97f2c88b23d5486505dd3b34c1f1643e02235a3e5fc5150ee5735946092efe +DIST libarchive-3.7.2.tar.xz 5237056 BLAKE2B 7221db4811a965ee61d879a2603480363628a19995a351b572d099be9f35576d76f0b0822f9a5a47d9929bc094d4444fd8eafcb4a073e39bb3aa797d4b926ca5 SHA512 a21bebb27b808cb7d2ed13a70739904a1b7b55661d8dea83c9897a0129cf71e20c962f13666c571782ff0f4f753ca885619c2097d9e7691c2dee4e6e4b9a2971 +DIST libarchive-3.7.2.tar.xz.asc 659 BLAKE2B 7141baf007b89b7ee38ec817b648cef5efb4d694953fcd49f6ed2dc95cf4da2d9259262b9eb4f01ff5d4ecee1257b266a8c6687a8e8ef8790121048229f1ad22 SHA512 c2ce850088245d7723720737d74d1cc1819984d01b3f9e4ed96b0757f4c6d6d511b78792181a12400c563632d74edcd0c2c3a4b7527cba40ada7ef74488078fc +DIST libarchive-3.7.3.tar.xz 5428992 BLAKE2B c53672c8cdbe8f406f00bf4fc6b36e4dffcd23a33909dbec6ef06b86dceefc6062840eff629ba3bd19c36121720e16a8ba10dfa1a35ebed186cc92eb144f55d0 SHA512 984e7c61010b9555bafe54d5f52ff2d089e28afe5cea3a14615e2aca8539075293789d18f17f8915882ec328bcbdca7b3d1536d6dc19620ca226e8b6d802ef63 +DIST libarchive-3.7.3.tar.xz.asc 659 BLAKE2B bfe18e36ef2e96ad46ab2cd1236701b4b80f41ebb840681c1baf7eac72f38444cc0619645fac17d3acdda6553b294483d87f0a92d9575138d117934e838d85d2 SHA512 9f340b41fc9db34f1c4e0823d559b666196d3031249e05981cfb43a401aa8a85710f14ba1cc784ab3ca367439e4c485668dffe7020f38f50b3ed35810df504a1 +DIST libarchive-3.7.4.tar.xz 5417660 BLAKE2B 128f72235da61e112201046c0cfe62a8c580cf73b426c4cfe270ae913356f6ad430ba33a663dcd617b082c7baf45ada8d1c9928c45fea16fd57e8020693a60bc SHA512 84bc346ba15861ab10aa54a3d687de955178e4efbe12bf3a49a467181e7f819673949f131f4c8338de8ed6e319a8565af376e5a540380bda08e60dffbc7c8686 +DIST libarchive-3.7.4.tar.xz.asc 659 BLAKE2B 77e705194f6e9a9f97da0ac43c9b3157e1a8a490d26da34079e4ef3f2bcf98d6f6e95567e110287fab0ec26d3fc27e5bbeff7569c9ca138de2caf47af737c6d0 SHA512 82caa18a78661ea717ce93cdcb0806eed48450c20fb4d45cb4c33001f2d4d0fb5a791552acbb24ad8c41772e1d0b66c76c9cb86946bc862109721a0c986f5331 diff --git a/app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch b/app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch deleted file mode 100644 index da71a196b875..000000000000 --- a/app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001 -From: obiwac <obiwac@gmail.com> -Date: Fri, 22 Jul 2022 22:41:10 +0200 -Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754) - ---- - libarchive/archive_write.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c -index 66592e826..27626b541 100644 ---- a/libarchive/archive_write.c -+++ b/libarchive/archive_write.c -@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a) - struct archive_write_filter *f; - - f = calloc(1, sizeof(*f)); -+ -+ if (f == NULL) -+ return (NULL); -+ - f->archive = _a; - f->state = ARCHIVE_WRITE_FILTER_STATE_NEW; - if (a->filter_first == NULL) -@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data, - a->client_data = client_data; - - client_filter = __archive_write_allocate_filter(_a); -+ -+ if (client_filter == NULL) -+ return (ARCHIVE_FATAL); -+ - client_filter->open = archive_write_client_open; - client_filter->write = archive_write_client_write; - client_filter->close = archive_write_client_close; diff --git a/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch b/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch deleted file mode 100644 index e45d891e2a17..000000000000 --- a/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://github.com/libarchive/libarchive/pull/1761 -https://bugs.gentoo.org/863227 - -From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 25 Jul 2022 10:56:53 -0700 -Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is - present - -These headers are in conflict and only one is needed by -archive_read_disk_posix.c therefore include linux/fs.h if it exists -otherwise include sys/mount.h - -It also helps compiling with glibc 2.36 -where sys/mount.h conflicts with linux/mount.h see [1] - -[1] https://sourceware.org/glibc/wiki/Release/2.36 ---- a/libarchive/archive_read_disk_posix.c -+++ b/libarchive/archive_read_disk_posix.c -@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$"); - #ifdef HAVE_SYS_PARAM_H - #include <sys/param.h> - #endif --#ifdef HAVE_SYS_MOUNT_H --#include <sys/mount.h> --#endif - #ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> - #endif -@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$"); - #endif - #ifdef HAVE_LINUX_FS_H - #include <linux/fs.h> -+#elif HAVE_SYS_MOUNT_H -+#include <sys/mount.h> - #endif - /* - * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h. - diff --git a/app-arch/libarchive/files/libarchive-3.7.2-32bit-test.patch b/app-arch/libarchive/files/libarchive-3.7.2-32bit-test.patch new file mode 100644 index 000000000000..5f43c2626735 --- /dev/null +++ b/app-arch/libarchive/files/libarchive-3.7.2-32bit-test.patch @@ -0,0 +1,29 @@ +From 3bd918d92f8c34ba12de9c6604d96f9e262a59fc Mon Sep 17 00:00:00 2001 +From: Martin Matuska <martin@matuska.de> +Date: Tue, 12 Sep 2023 08:54:47 +0200 +Subject: [PATCH] tests: fix zstd long option test for 32-bit architectures + +Fixes #1968 +--- + libarchive/test/test_write_filter_zstd.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/libarchive/test/test_write_filter_zstd.c b/libarchive/test/test_write_filter_zstd.c +index 3cdbd812a..c9731f1b6 100644 +--- a/libarchive/test/test_write_filter_zstd.c ++++ b/libarchive/test/test_write_filter_zstd.c +@@ -161,8 +161,12 @@ DEFINE_TEST(test_write_filter_zstd) + archive_write_set_filter_option(a, NULL, "max-frame-size", "1048576")); + #endif + #if ZSTD_VERSION_NUMBER >= MINVER_LONG +- assertEqualIntA(a, ARCHIVE_OK, +- archive_write_set_filter_option(a, NULL, "long", "27")); ++ if ((int)(sizeof(size_t) == 4)) ++ assertEqualIntA(a, ARCHIVE_OK, ++ archive_write_set_filter_option(a, NULL, "long", "26")); ++ else ++ assertEqualIntA(a, ARCHIVE_OK, ++ archive_write_set_filter_option(a, NULL, "long", "27")); + assertEqualIntA(a, ARCHIVE_FAILED, + archive_write_set_filter_option(a, NULL, "long", "-1")); /* negative */ + #endif diff --git a/app-arch/libarchive/files/libarchive-3.7.2-lrzip.patch b/app-arch/libarchive/files/libarchive-3.7.2-lrzip.patch new file mode 100644 index 000000000000..f05b46c1a340 --- /dev/null +++ b/app-arch/libarchive/files/libarchive-3.7.2-lrzip.patch @@ -0,0 +1,26 @@ +diff --git a/libarchive/archive_read_support_filter_lrzip.c b/libarchive/archive_read_support_filter_lrzip.c +index a562d538..f3ec40c4 100644 +--- a/libarchive/archive_read_support_filter_lrzip.c ++++ b/libarchive/archive_read_support_filter_lrzip.c +@@ -109,7 +109,7 @@ lrzip_bidder_init(struct archive_read_filter *self) + { + int r; + +- r = __archive_read_program(self, "lrzip -d -q"); ++ r = __archive_read_program(self, "lrzip -d -Q"); + /* Note: We set the format here even if __archive_read_program() + * above fails. We do, after all, know what the format is + * even if we weren't able to read it. */ +diff --git a/libarchive/archive_write_add_filter_lrzip.c b/libarchive/archive_write_add_filter_lrzip.c +index fe974c93..8fe498dd 100644 +--- a/libarchive/archive_write_add_filter_lrzip.c ++++ b/libarchive/archive_write_add_filter_lrzip.c +@@ -133,7 +133,7 @@ archive_write_lrzip_open(struct archive_write_filter *f) + int r; + + archive_string_init(&as); +- archive_strcpy(&as, "lrzip -q"); ++ archive_strcpy(&as, "lrzip -Q"); + + /* Specify compression type. */ + switch (data->compression) { diff --git a/app-arch/libarchive/files/libarchive-3.7.2-safe-fprintf.patch b/app-arch/libarchive/files/libarchive-3.7.2-safe-fprintf.patch new file mode 100644 index 000000000000..6a351ba37fea --- /dev/null +++ b/app-arch/libarchive/files/libarchive-3.7.2-safe-fprintf.patch @@ -0,0 +1,27 @@ +From 6110e9c82d8ba830c3440f36b990483ceaaea52c Mon Sep 17 00:00:00 2001 +From: Ed Maste <emaste@freebsd.org> +Date: Fri, 29 Mar 2024 18:02:06 -0400 +Subject: [PATCH] tar: make error reporting more robust and use correct errno + (#2101) + +As discussed in #1609. +--- + tar/read.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tar/read.c b/tar/read.c +index af3d3f423..a7f14a07b 100644 +--- a/tar/read.c ++++ b/tar/read.c +@@ -371,8 +371,9 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer) + if (r != ARCHIVE_OK) { + if (!bsdtar->verbose) + safe_fprintf(stderr, "%s", archive_entry_pathname(entry)); +- fprintf(stderr, ": %s: ", archive_error_string(a)); +- fprintf(stderr, "%s", strerror(errno)); ++ safe_fprintf(stderr, ": %s: %s", ++ archive_error_string(a), ++ strerror(archive_errno(a))); + if (!bsdtar->verbose) + fprintf(stderr, "\n"); + bsdtar->return_value = 1; diff --git a/app-arch/libarchive/libarchive-3.6.1-r1.ebuild b/app-arch/libarchive/libarchive-3.7.2-r1.ebuild index 98013595c225..3ca312b679f8 100644 --- a/app-arch/libarchive/libarchive-3.6.1-r1.ebuild +++ b/app-arch/libarchive/libarchive-3.7.2-r1.ebuild @@ -1,11 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit multilib-minimal toolchain-funcs verify-sig DESCRIPTION="Multi-format archive and compression library" -HOMEPAGE="https://www.libarchive.org/" +HOMEPAGE=" + https://www.libarchive.org/ + https://github.com/libarchive/libarchive/ +" SRC_URI=" https://www.libarchive.de/downloads/${P}.tar.xz verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc ) @@ -13,9 +16,12 @@ 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc +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 +" +RESTRICT="!test? ( test )" RDEPEND=" sys-libs/zlib[${MULTILIB_USEDEP}] @@ -40,15 +46,30 @@ DEPEND="${RDEPEND} virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] ) ) + test? ( + lzma? ( app-arch/xz-utils[extra-filters(+)] ) + ) " BDEPEND=" - verify-sig? ( <sec-keys/openpgp-keys-libarchive-20221209 ) + verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 ) + elibc_musl? ( sys-libs/queue-standalone ) " +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libarchive.org.asc + +# false positives (checks for libc-defined hash functions) +QA_CONFIG_IMPL_DECL_SKIP=( + SHA256_Init SHA256_Update SHA256_Final + SHA384_Init SHA384_Update SHA384_Final + SHA512_Init SHA512_Update SHA512_Final +) + PATCHES=( - "${FILESDIR}"/${P}-glibc-2.36.patch - # https://github.com/libarchive/libarchive/pull/1759 - "${FILESDIR}"/${P}-CVE-2022-36227.patch + # https://github.com/libarchive/libarchive/issues/1968 + "${FILESDIR}/${P}-32bit-test.patch" + # https://github.com/libarchive/libarchive/issues/2069 + # (we can simply update the command since we don't support old lrzip) + "${FILESDIR}/${P}-lrzip.patch" ) multilib_src_configure() { @@ -78,12 +99,14 @@ multilib_src_configure() { --enable-bsdcat="$(tc-is-static-only && echo static || echo shared)" --enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)" --enable-bsdtar="$(tc-is-static-only && echo static || echo shared)" + --enable-bsdunzip="$(tc-is-static-only && echo static || echo shared)" ) else myconf+=( --disable-bsdcat --disable-bsdcpio --disable-bsdtar + --disable-bsdunzip ) fi @@ -129,4 +152,7 @@ multilib_src_install() { # Libs.private: should be used from libarchive.pc instead find "${ED}" -type f -name "*.la" -delete || die + # https://github.com/libarchive/libarchive/issues/1766 + sed -e '/Requires\.private/s:iconv::' \ + -i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die } diff --git a/app-arch/libarchive/libarchive-3.7.2-r3.ebuild b/app-arch/libarchive/libarchive-3.7.2-r3.ebuild new file mode 100644 index 000000000000..476a896e4be3 --- /dev/null +++ b/app-arch/libarchive/libarchive-3.7.2-r3.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit libtool multilib-minimal toolchain-funcs verify-sig + +DESCRIPTION="Multi-format archive and compression library" +HOMEPAGE=" + https://www.libarchive.org/ + https://github.com/libarchive/libarchive/ +" +SRC_URI=" + https://www.libarchive.de/downloads/${P}.tar.xz + verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc ) +" + +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" +IUSE=" + acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle + static-libs test xattr +zstd +" +RESTRICT="!test? ( test )" + +RDEPEND=" + sys-libs/zlib[${MULTILIB_USEDEP}] + acl? ( virtual/acl[${MULTILIB_USEDEP}] ) + blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] ) + bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) + !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) + iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) + kernel_linux? ( + xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) + ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] + lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] ) + lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) + nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + kernel_linux? ( + virtual/os-headers + e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] ) + ) + test? ( + app-arch/lrzip + app-arch/lz4 + app-arch/lzip + app-arch/lzop + app-arch/xz-utils + app-arch/zstd + lzma? ( app-arch/xz-utils[extra-filters(+)] ) + ) +" +BDEPEND=" + verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 ) + elibc_musl? ( sys-libs/queue-standalone ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libarchive.org.asc + +# false positives (checks for libc-defined hash functions) +QA_CONFIG_IMPL_DECL_SKIP=( + SHA256_Init SHA256_Update SHA256_Final + SHA384_Init SHA384_Update SHA384_Final + SHA512_Init SHA512_Update SHA512_Final +) + +PATCHES=( + # https://github.com/libarchive/libarchive/issues/1968 + "${FILESDIR}/${P}-32bit-test.patch" + # https://github.com/libarchive/libarchive/issues/2069 + # (we can simply update the command since we don't support old lrzip) + "${FILESDIR}/${P}-lrzip.patch" + # https://github.com/libarchive/libarchive/pull/2101 + "${FILESDIR}/${P}-safe-fprintf.patch" +) + +src_prepare() { + default + + # Needed for flags to be respected w/ LTO + elibtoolize +} + +multilib_src_configure() { + export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 + + local myconf=( + $(use_enable acl) + $(use_enable static-libs static) + $(use_enable xattr) + $(use_with blake2 libb2) + $(use_with bzip2 bz2lib) + $(use_with expat) + $(use_with !expat xml2) + $(use_with iconv) + $(use_with lz4) + $(use_with lzma) + $(use_with lzo lzo2) + $(use_with nettle) + --with-zlib + $(use_with zstd) + + # Windows-specific + --without-cng + ) + if multilib_is_native_abi ; then + myconf+=( + --enable-bsdcat="$(tc-is-static-only && echo static || echo shared)" + --enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)" + --enable-bsdtar="$(tc-is-static-only && echo static || echo shared)" + --enable-bsdunzip="$(tc-is-static-only && echo static || echo shared)" + ) + else + myconf+=( + --disable-bsdcat + --disable-bsdcpio + --disable-bsdtar + --disable-bsdunzip + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi ; then + emake + else + emake libarchive.la + fi +} + +src_test() { + mkdir -p "${T}"/bin || die + # tests fail when lbzip2[symlink] is used in place of ref bunzip2 + ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die + # workaround lrzip broken on 32-bit arches with >= 10 threads + # https://bugs.gentoo.org/927766 + cat > "${T}"/bin/lrzip <<-EOF || die + #!/bin/sh + exec "$(type -P lrzip)" -p1 "\${@}" + EOF + chmod +x "${T}/bin/lrzip" || die + local -x PATH=${T}/bin:${PATH} + multilib-minimal_src_test +} + +multilib_src_test() { + # sandbox is breaking long symlink behavior + local -x SANDBOX_ON=0 + local -x LD_PRELOAD= + # some locales trigger different output that breaks tests + local -x LC_ALL=C + emake check +} + +multilib_src_install() { + if multilib_is_native_abi ; then + emake DESTDIR="${D}" install + else + local install_targets=( + install-includeHEADERS + install-libLTLIBRARIES + install-pkgconfigDATA + ) + emake DESTDIR="${D}" "${install_targets[@]}" + fi + + # Libs.private: should be used from libarchive.pc instead + find "${ED}" -type f -name "*.la" -delete || die + # https://github.com/libarchive/libarchive/issues/1766 + sed -e '/Requires\.private/s:iconv::' \ + -i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die +} diff --git a/app-arch/libarchive/libarchive-3.7.3.ebuild b/app-arch/libarchive/libarchive-3.7.3.ebuild new file mode 100644 index 000000000000..073f78ef0d2c --- /dev/null +++ b/app-arch/libarchive/libarchive-3.7.3.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit libtool multilib-minimal toolchain-funcs verify-sig + +DESCRIPTION="Multi-format archive and compression library" +HOMEPAGE=" + https://www.libarchive.org/ + https://github.com/libarchive/libarchive/ +" +SRC_URI=" + https://www.libarchive.de/downloads/${P}.tar.xz + verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc ) +" + +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" +IUSE=" + acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle + static-libs test xattr +zstd +" +RESTRICT="!test? ( test )" + +RDEPEND=" + sys-libs/zlib[${MULTILIB_USEDEP}] + acl? ( virtual/acl[${MULTILIB_USEDEP}] ) + blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] ) + bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) + !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) + iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) + kernel_linux? ( + xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) + ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] + lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] ) + lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) + nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + kernel_linux? ( + virtual/os-headers + e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] ) + ) + test? ( + app-arch/lrzip + app-arch/lz4 + app-arch/lzip + app-arch/lzop + app-arch/xz-utils + app-arch/zstd + lzma? ( app-arch/xz-utils[extra-filters(+)] ) + ) +" +BDEPEND=" + verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 ) + elibc_musl? ( sys-libs/queue-standalone ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libarchive.org.asc + +# false positives (checks for libc-defined hash functions) +QA_CONFIG_IMPL_DECL_SKIP=( + SHA256_Init SHA256_Update SHA256_Final + SHA384_Init SHA384_Update SHA384_Final + SHA512_Init SHA512_Update SHA512_Final +) + +PATCHES=( + # https://github.com/libarchive/libarchive/issues/2069 + # (we can simply update the command since we don't support old lrzip) + "${FILESDIR}/${PN}-3.7.2-lrzip.patch" +) + +src_prepare() { + default + + # Needed for flags to be respected w/ LTO + elibtoolize +} + +multilib_src_configure() { + export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 + + local myconf=( + $(use_enable acl) + $(use_enable static-libs static) + $(use_enable xattr) + $(use_with blake2 libb2) + $(use_with bzip2 bz2lib) + $(use_with expat) + $(use_with !expat xml2) + $(use_with iconv) + $(use_with lz4) + $(use_with lzma) + $(use_with lzo lzo2) + $(use_with nettle) + --with-zlib + $(use_with zstd) + + # Windows-specific + --without-cng + ) + if multilib_is_native_abi ; then + myconf+=( + --enable-bsdcat="$(tc-is-static-only && echo static || echo shared)" + --enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)" + --enable-bsdtar="$(tc-is-static-only && echo static || echo shared)" + --enable-bsdunzip="$(tc-is-static-only && echo static || echo shared)" + ) + else + myconf+=( + --disable-bsdcat + --disable-bsdcpio + --disable-bsdtar + --disable-bsdunzip + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi ; then + emake + else + emake libarchive.la + fi +} + +src_test() { + mkdir -p "${T}"/bin || die + # tests fail when lbzip2[symlink] is used in place of ref bunzip2 + ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die + # workaround lrzip broken on 32-bit arches with >= 10 threads + # https://bugs.gentoo.org/927766 + cat > "${T}"/bin/lrzip <<-EOF || die + #!/bin/sh + exec "$(type -P lrzip)" -p1 "\${@}" + EOF + chmod +x "${T}/bin/lrzip" || die + local -x PATH=${T}/bin:${PATH} + multilib-minimal_src_test +} + +multilib_src_test() { + # sandbox is breaking long symlink behavior + local -x SANDBOX_ON=0 + local -x LD_PRELOAD= + # some locales trigger different output that breaks tests + local -x LC_ALL=C.UTF-8 + emake check +} + +multilib_src_install() { + if multilib_is_native_abi ; then + emake DESTDIR="${D}" install + else + local install_targets=( + install-includeHEADERS + install-libLTLIBRARIES + install-pkgconfigDATA + ) + emake DESTDIR="${D}" "${install_targets[@]}" + fi + + # Libs.private: should be used from libarchive.pc instead + find "${ED}" -type f -name "*.la" -delete || die + # https://github.com/libarchive/libarchive/issues/1766 + sed -e '/Requires\.private/s:iconv::' \ + -i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die +} diff --git a/app-arch/libarchive/libarchive-3.6.2.ebuild b/app-arch/libarchive/libarchive-3.7.4.ebuild index 2f4b076f78df..4e1429fdc70c 100644 --- a/app-arch/libarchive/libarchive-3.6.2.ebuild +++ b/app-arch/libarchive/libarchive-3.7.4.ebuild @@ -1,11 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit multilib-minimal toolchain-funcs verify-sig +inherit libtool multilib-minimal toolchain-funcs verify-sig DESCRIPTION="Multi-format archive and compression library" -HOMEPAGE="https://www.libarchive.org/" +HOMEPAGE=" + https://www.libarchive.org/ + https://github.com/libarchive/libarchive/ +" SRC_URI=" https://www.libarchive.de/downloads/${P}.tar.xz verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc ) @@ -13,9 +16,12 @@ 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc +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 +" +RESTRICT="!test? ( test )" RDEPEND=" sys-libs/zlib[${MULTILIB_USEDEP}] @@ -40,11 +46,43 @@ DEPEND="${RDEPEND} virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] ) ) + test? ( + app-arch/lrzip + app-arch/lz4 + app-arch/lzip + app-arch/lzop + app-arch/xz-utils + app-arch/zstd + lzma? ( app-arch/xz-utils[extra-filters(+)] ) + ) " BDEPEND=" verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 ) + elibc_musl? ( sys-libs/queue-standalone ) " +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libarchive.org.asc + +# false positives (checks for libc-defined hash functions) +QA_CONFIG_IMPL_DECL_SKIP=( + SHA256_Init SHA256_Update SHA256_Final + SHA384_Init SHA384_Update SHA384_Final + SHA512_Init SHA512_Update SHA512_Final +) + +PATCHES=( + # https://github.com/libarchive/libarchive/issues/2069 + # (we can simply update the command since we don't support old lrzip) + "${FILESDIR}/${PN}-3.7.2-lrzip.patch" +) + +src_prepare() { + default + + # Needed for flags to be respected w/ LTO + elibtoolize +} + multilib_src_configure() { export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 @@ -72,12 +110,14 @@ multilib_src_configure() { --enable-bsdcat="$(tc-is-static-only && echo static || echo shared)" --enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)" --enable-bsdtar="$(tc-is-static-only && echo static || echo shared)" + --enable-bsdunzip="$(tc-is-static-only && echo static || echo shared)" ) else myconf+=( --disable-bsdcat --disable-bsdcpio --disable-bsdtar + --disable-bsdunzip ) fi @@ -96,6 +136,13 @@ src_test() { mkdir -p "${T}"/bin || die # tests fail when lbzip2[symlink] is used in place of ref bunzip2 ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die + # workaround lrzip broken on 32-bit arches with >= 10 threads + # https://bugs.gentoo.org/927766 + cat > "${T}"/bin/lrzip <<-EOF || die + #!/bin/sh + exec "$(type -P lrzip)" -p1 "\${@}" + EOF + chmod +x "${T}/bin/lrzip" || die local -x PATH=${T}/bin:${PATH} multilib-minimal_src_test } @@ -105,7 +152,7 @@ multilib_src_test() { local -x SANDBOX_ON=0 local -x LD_PRELOAD= # some locales trigger different output that breaks tests - local -x LC_ALL=C + local -x LC_ALL=C.UTF-8 emake check } @@ -123,4 +170,7 @@ multilib_src_install() { # Libs.private: should be used from libarchive.pc instead find "${ED}" -type f -name "*.la" -delete || die + # https://github.com/libarchive/libarchive/issues/1766 + sed -e '/Requires\.private/s:iconv::' \ + -i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die } diff --git a/app-arch/libdeflate/Manifest b/app-arch/libdeflate/Manifest new file mode 100644 index 000000000000..280c6644dba1 --- /dev/null +++ b/app-arch/libdeflate/Manifest @@ -0,0 +1,2 @@ +DIST libdeflate-1.19.tar.gz 187684 BLAKE2B 6d3c58b4095f91f64c25e09a062f1d7e68cd43b4dffc2de6484cd941ede4bffd8a82dd3af08eda6c94ad4120d40809c1d6a1814c28bad5387dfbaad418b93070 SHA512 fe57542a0d28ad61d70bef9b544bb6805f9f30930b16432712b3b1caab041f1f4e64315a4306a0635b96c2632239c5af0e45a3915581d0b89975729fc2e95613 +DIST libdeflate-1.20.tar.gz 194212 BLAKE2B b3633f1068f36bf346e1f435c67259612ad5ed1571e83f1bbc4a58c6a67b3eadca85e0abb2d2d47f180dd2ff01c5891c8b3958a63ddbcc2447106f2e5cb3c0fe SHA512 5ebe6af9ce81872cba508d1f0aa087ddeb0e0f0c8e6360da66b8a9db2a76203dafbf3d3f6b3b791618ea9c6d0231fab5b4a55badb31a4480fb4174b9445c658b diff --git a/app-arch/libdeflate/files/libdeflate-1.19-make-gzip-tests-conditional.patch b/app-arch/libdeflate/files/libdeflate-1.19-make-gzip-tests-conditional.patch new file mode 100644 index 000000000000..ae290f3f69d2 --- /dev/null +++ b/app-arch/libdeflate/files/libdeflate-1.19-make-gzip-tests-conditional.patch @@ -0,0 +1,37 @@ +Only build these when the user enables zlib and gzip support +diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt +index e707a25..fcfaf12 100644 +--- a/programs/CMakeLists.txt ++++ b/programs/CMakeLists.txt +@@ -80,22 +80,28 @@ if(LIBDEFLATE_BUILD_TESTS) + target_link_libraries(libdeflate_test_utils PUBLIC + libdeflate_prog_utils ZLIB::ZLIB) + ++ if(LIBDEFLATE_GZIP_SUPPORT AND LIBDEFLATE_ZLIB_SUPPORT) + # Build the benchmark and checksum programs. + add_executable(benchmark benchmark.c) + target_link_libraries(benchmark PRIVATE libdeflate_test_utils) + add_executable(checksum checksum.c) + target_link_libraries(checksum PRIVATE libdeflate_test_utils) ++ endif() + + # Build the unit test programs and register them with CTest. + set(UNIT_TEST_PROGS +- test_checksums + test_custom_malloc + test_incomplete_codes + test_invalid_streams + test_litrunlen_overflow + test_overread + test_slow_decompression +- test_trailing_bytes + ) ++ if(LIBDEFLATE_GZIP_SUPPORT AND LIBDEFLATE_ZLIB_SUPPORT) ++ list(APPEND UNIT_TEST_PROGS ++ test_checksums ++ test_trailing_bytes ++ ) ++ endif() + foreach(PROG ${UNIT_TEST_PROGS}) + add_executable(${PROG} ${PROG}.c) + target_link_libraries(${PROG} PRIVATE libdeflate_test_utils) diff --git a/app-arch/libdeflate/libdeflate-1.19.ebuild b/app-arch/libdeflate/libdeflate-1.19.ebuild new file mode 100644 index 000000000000..b637d83a6dfe --- /dev/null +++ b/app-arch/libdeflate/libdeflate-1.19.ebuild @@ -0,0 +1,59 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression" +HOMEPAGE="https://github.com/ebiggers/libdeflate" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ebiggers/libdeflate.git" +else + SRC_URI="https://github.com/ebiggers/libdeflate/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" +fi + +LICENSE="MIT" +SLOT="0" +# the zlib USE-flag enables support for zlib +# the test USE-flag programs depend on sys-libs/zlib for comparison tests +IUSE="+gzip +utils +zlib test" + +RESTRICT=" + !test? ( test ) +" + +REQUIRED_USE=" + utils? ( gzip ) +" + +DEPEND=" + test? ( sys-libs/zlib ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.19-make-gzip-tests-conditional.patch" +) + +src_configure() { + local mycmakeargs=( + -DLIBDEFLATE_BUILD_SHARED_LIB="yes" + -DLIBDEFLATE_BUILD_STATIC_LIB="no" + -DLIBDEFLATE_USE_SHARED_LIB="yes" + + -DLIBDEFLATE_COMPRESSION_SUPPORT="yes" + -DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes" + + -DLIBDEFLATE_BUILD_GZIP="$(usex gzip "$(usex utils)" )" + -DLIBDEFLATE_GZIP_SUPPORT="$(usex gzip)" + + -DLIBDEFLATE_ZLIB_SUPPORT="$(usex zlib)" + + -DLIBDEFLATE_BUILD_TESTS="$(usex test)" + ) + + cmake_src_configure +} diff --git a/app-arch/libdeflate/libdeflate-1.20.ebuild b/app-arch/libdeflate/libdeflate-1.20.ebuild new file mode 100644 index 000000000000..19e1b432a064 --- /dev/null +++ b/app-arch/libdeflate/libdeflate-1.20.ebuild @@ -0,0 +1,59 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression" +HOMEPAGE="https://github.com/ebiggers/libdeflate" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ebiggers/libdeflate.git" +else + SRC_URI="https://github.com/ebiggers/libdeflate/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="MIT" +SLOT="0" +# the zlib USE-flag enables support for zlib +# the test USE-flag programs depend on sys-libs/zlib for comparison tests +IUSE="+gzip +utils +zlib test" + +RESTRICT=" + !test? ( test ) +" + +REQUIRED_USE=" + utils? ( gzip ) +" + +DEPEND=" + test? ( sys-libs/zlib ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.19-make-gzip-tests-conditional.patch" +) + +src_configure() { + local mycmakeargs=( + -DLIBDEFLATE_BUILD_SHARED_LIB="yes" + -DLIBDEFLATE_BUILD_STATIC_LIB="no" + -DLIBDEFLATE_USE_SHARED_LIB="yes" + + -DLIBDEFLATE_COMPRESSION_SUPPORT="yes" + -DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes" + + -DLIBDEFLATE_BUILD_GZIP="$(usex gzip "$(usex utils)" )" + -DLIBDEFLATE_GZIP_SUPPORT="$(usex gzip)" + + -DLIBDEFLATE_ZLIB_SUPPORT="$(usex zlib)" + + -DLIBDEFLATE_BUILD_TESTS="$(usex test)" + ) + + cmake_src_configure +} diff --git a/app-arch/libdeflate/libdeflate-9999.ebuild b/app-arch/libdeflate/libdeflate-9999.ebuild new file mode 100644 index 000000000000..2ed3a652def2 --- /dev/null +++ b/app-arch/libdeflate/libdeflate-9999.ebuild @@ -0,0 +1,59 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression" +HOMEPAGE="https://github.com/ebiggers/libdeflate" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ebiggers/libdeflate.git" +else + SRC_URI="https://github.com/ebiggers/libdeflate/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" +# the zlib USE-flag enables support for zlib +# the test USE-flag programs depend on sys-libs/zlib for comparison tests +IUSE="+gzip +utils +zlib test" + +RESTRICT=" + !test? ( test ) +" + +REQUIRED_USE=" + utils? ( gzip ) +" + +DEPEND=" + test? ( sys-libs/zlib ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.19-make-gzip-tests-conditional.patch" +) + +src_configure() { + local mycmakeargs=( + -DLIBDEFLATE_BUILD_SHARED_LIB="yes" + -DLIBDEFLATE_BUILD_STATIC_LIB="no" + -DLIBDEFLATE_USE_SHARED_LIB="yes" + + -DLIBDEFLATE_COMPRESSION_SUPPORT="yes" + -DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes" + + -DLIBDEFLATE_BUILD_GZIP="$(usex gzip "$(usex utils)" )" + -DLIBDEFLATE_GZIP_SUPPORT="$(usex gzip)" + + -DLIBDEFLATE_ZLIB_SUPPORT="$(usex zlib)" + + -DLIBDEFLATE_BUILD_TESTS="$(usex test)" + ) + + cmake_src_configure +} diff --git a/app-arch/libdeflate/metadata.xml b/app-arch/libdeflate/metadata.xml new file mode 100644 index 000000000000..17956aa98f85 --- /dev/null +++ b/app-arch/libdeflate/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-wanted --> + <maintainer type="person" proxied="yes"> + <email>negril.nx+gentoo@gmail.com</email> + <name>Paul Zander</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="gzip">Support the gzip format</flag> + <flag name="test">Build the test programs (requires <pkg>sys-libs/zlib</pkg>)</flag> + <flag name="utils">Build the libdeflate-gzip program</flag> + <flag name="zlib">Support the zlib format</flag> + </use> + <upstream> + <remote-id type="github">ebiggers/libdeflate</remote-id> + </upstream> +</pkgmetadata>
\ No newline at end of file diff --git a/app-arch/lrzip-next/Manifest b/app-arch/lrzip-next/Manifest new file mode 100644 index 000000000000..256514f707f8 --- /dev/null +++ b/app-arch/lrzip-next/Manifest @@ -0,0 +1 @@ +DIST lrzip-next-0.12.6.tar.gz 600081 BLAKE2B 952b3aefcf424b4626f14caaefc7b160a271330903227207cec249306750dfd24097abfdae159d82dc86e08711f51789ca72bcc66b6d7f4bdd9b892133759dae SHA512 768edaa4059e7a5561a738779cca5e5c46525c0a3f5888fc4e730fe6664f390fa8409060c86076b4b4cc327e317c37d59d557a55db67d97d39da6369788763c8 diff --git a/app-arch/lrzip-next/lrzip-next-0.12.6-r1.ebuild b/app-arch/lrzip-next/lrzip-next-0.12.6-r1.ebuild new file mode 100644 index 000000000000..e218f7e3e4fe --- /dev/null +++ b/app-arch/lrzip-next/lrzip-next-0.12.6-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit autotools + +DESCRIPTION="Fork of Con Kolivas' lrzip program for compressing large files" +HOMEPAGE="https://github.com/pete4abw/lrzip-next" +SRC_URI="https://github.com/pete4abw/lrzip-next/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="asm static-libs year2038" + +RDEPEND="app-arch/bzip2 + app-arch/bzip3 + app-arch/lz4 + app-arch/zstd + dev-libs/libgcrypt + dev-libs/libgpg-error + dev-libs/lzo + sys-libs/zlib" +DEPEND="${RDEPEND}" +BDEPEND="amd64? ( dev-lang/nasm )" + +src_prepare() { + default + + # configure.ac uses a small helper script, ./util/gitdesc.sh, to + # see if it's a tarball or git repo copy. If tarball, it extracts + # the version information from a local VERSION file and puts it into + # configure.ac at the top for major/minor/micro. To avoid the need + # for a BDEPEND on dev-vcs/git, we can do this directly. + local major=$(awk '/Major: / {printf "%s",$2; exit}' VERSION) + local minor=$(awk '/Minor: / {printf "%s",$2; exit}' VERSION) + local micro=$(awk '/Micro: / {printf "%s",$2; exit}' VERSION) + sed -i -e "s:\[m4_esyscmd_s(\[./util/gitdesc.sh major\])\]:${major}:" configure.ac + sed -i -e "s:\[m4_esyscmd_s(\[./util/gitdesc.sh minor\])\]:${minor}:" configure.ac + sed -i -e "s:\[m4_esyscmd_s(\[./util/gitdesc.sh micro\])\]:${micro}:" configure.ac + + eautoreconf +} + +src_configure() { + local myconf=( + $(use_enable static-libs static) \ + $(use_enable amd64 asm) + ) + + # This configure switch disappears on a musl system for some + # reason. However, this package is currently broken on musl, + # but we'll leave this in place while we see if upstream has + # any advice. + if ! use elibc_musl; then + myconf+=( $(use_enable year2038) ) + fi + + econf "${myconf[@]}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/app-arch/lrzip-next/metadata.xml b/app-arch/lrzip-next/metadata.xml new file mode 100644 index 000000000000..d0dea613ffd3 --- /dev/null +++ b/app-arch/lrzip-next/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>kumba@gentoo.org</email> + <name>Joshua Kinard</name> + </maintainer> + <longdescription> + A fork of Con Kolivas' 'lrzip' program that is actively maintained. Lrzip + is a compression program optimised for large files. The larger the file and + the more memory you have, the better the compression advantage this will + provide, especially once the files are larger than 100MB. The advantage can + be chosen to be either size (much smaller than bzip2) or speed (much faster + than bzip2). + </longdescription> + <upstream> + <remote-id type="github">pete4abw/lrzip-next</remote-id> + </upstream> + <use> + <flag name="year2038">Enables support for timestamps after the year 2038</flag> + </use> +</pkgmetadata> diff --git a/app-arch/lrzip/lrzip-0.651.ebuild b/app-arch/lrzip/lrzip-0.651.ebuild index ab138526e592..6e0a4f4510ab 100644 --- a/app-arch/lrzip/lrzip-0.651.ebuild +++ b/app-arch/lrzip/lrzip-0.651.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ckolivas/lrzip/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs" RDEPEND="app-arch/bzip2 diff --git a/app-arch/lrzip/metadata.xml b/app-arch/lrzip/metadata.xml index a6fb81439347..85eef5cdea59 100644 --- a/app-arch/lrzip/metadata.xml +++ b/app-arch/lrzip/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!--maintainer-needed--> + <maintainer type="person"> + <email>kumba@gentoo.org</email> + <name>Joshua Kinard</name> + </maintainer> <longdescription> This is a compression program optimised for large files. The larger the file and the more memory you have, the better the compression advantage diff --git a/app-arch/lunzip/Manifest b/app-arch/lunzip/Manifest index 022bb8ea530b..a0288d57857a 100644 --- a/app-arch/lunzip/Manifest +++ b/app-arch/lunzip/Manifest @@ -1,2 +1,2 @@ -DIST lunzip-1.13.tar.gz 66541 BLAKE2B 45b6a4ffaac6d9b8ddeeebe5e33609bf4e671ad7370570035bacf41ee8ad35f49e14f495dfba650de284fedca1a63ebafe7f67c18083b4add94caaf7709d8e2b SHA512 67f950883b7062d37601bc16d7d64c07f6c580afbf3c0f61394dd6fb5d41c27214484b1dea7aabd41db06d18162b95b5734674646c4fcc833268cabe8cba91bb -DIST lunzip-1.13.tar.gz.sig 72 BLAKE2B a0d852dbb5394c5fb3e287cf4111290e0c603414de5a00a2d6173821df2410e4d826554ba4e04b5e9b7df0fa247cd95335a1a227b7cf38d4c5a7f3cc436be6ef SHA512 b71a73e7ad3a25140343db92c0ccf6311d0a30c71675e01a36da4735d0e0523d12d32b6472409359345ad6c9e550dccd399442d98fde44593af42f516119b3fb +DIST lunzip-1.14.tar.gz 69284 BLAKE2B 8ef63a5cfd0cf839889785845ec84b23451cb69b1e09c84526e000b82b73aaaa01b99407e87bde416ca2ab638d9f9688fcb37f77fd53e2a8e0875646a54d304c SHA512 2aa530c4ef7ebcfa345c8ac8701712e7f973ee4a92d34c33a03dd02a31d76507c919da373b64bc6b49b7868af8e4444d4b12bd71b8760e9b333c2a013ad95da1 +DIST lunzip-1.14.tar.gz.sig 72 BLAKE2B ab2ba6c265f197c322884898ae8ff5c8679ab8a1d2f71a2dfedcce9011e16fb723fd592b0edc3f48d540ad8d2578b799f28f9d609a7e26379e39e0cb7f908cc3 SHA512 38806848f904fb3700c908166a1ad2d601409fa13f1b0dc69372766b41a6f37ae0c5792964b8aae494320d47e603dc79f36b3fa7361ccf84b89835c14a6b7b11 diff --git a/app-arch/lunzip/lunzip-1.13.ebuild b/app-arch/lunzip/lunzip-1.14.ebuild index 3106eed819d3..11fb6199d603 100644 --- a/app-arch/lunzip/lunzip-1.13.ebuild +++ b/app-arch/lunzip/lunzip-1.14.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/antoniodiazdiaz.asc inherit toolchain-funcs verify-sig DESCRIPTION="Decompressor for the lzip format, written in C" @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/$ LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )" diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest index 6388218dc881..2d13fc201bcd 100644 --- a/app-arch/lxqt-archiver/Manifest +++ b/app-arch/lxqt-archiver/Manifest @@ -1,2 +1,2 @@ -DIST lxqt-archiver-0.6.0.tar.xz 180844 BLAKE2B 99de054cb3e002aa26637149611e6f054a8a406a3751b3b79584011616a8359fa003909f5059479979ff4b36ffa6a31807702b3b79465ad9ef75dbe008d51a32 SHA512 e714969ac285969b845cc3b293bf74fd3986be09ec0315aa11aca553e432397b8b68ec3830ae009f5fa950866b299e71aa89794de5af329f7012cb2524b310df -DIST lxqt-archiver-0.7.0.tar.xz 181612 BLAKE2B 41ad378f20a9a8f3d7ccfc7406d480eecfad41c991781f503947b37ee26eec5de38b44ea318507dc209a2f2f6d68db65e0f9cdf61920a47fb2d02dd975960f86 SHA512 d86fd636b1b2345ead8c4dc0161311b3e361d274902c5b34b9aaccf1a0b9af46d329fbec0d2249197b8e1c837d6949f723451f67fdc9ca4c6b7f1c2cf59daeca +DIST lxqt-archiver-0.9.0.tar.xz 183352 BLAKE2B 60443b7f4407b85bc1233f00ad2e46861c17281331d3b611021ca14be2e159befa0c8303d51b9021d35aa246d4fd9138ceb4f4b19cd6143438f8c3b976f9c40d SHA512 42ee097ae7fb17dbd00d9b94e8673664911c73bb5f353d08177c78d548eb24c39aa1daf57347eeefcb46ec63a8702c37f63ca2b42fd22bc85aed8f7a41585f3c +DIST lxqt-archiver-0.9.1.tar.xz 186600 BLAKE2B 365b849578f9f663ed7628c52c4c7205af10ea255dd131a94a6960c581111e02fedee01be0bd674d1ef71c9648cc5a58de1b548c972eb415cfae990e7045cfb4 SHA512 fd7862c85f6f93c870a4b28d2ed3705fcc0431e9b4d887f4fab6d860eddc5fe99d8a4c2f7cd2957c34d72b74a11b8eec49bbcca40dfee11f20f6a39f37e9ee00 diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.6.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.9.0.ebuild index 39c13ef281a6..91f86ad18d8d 100644 --- a/app-arch/lxqt-archiver/lxqt-archiver-0.6.0.ebuild +++ b/app-arch/lxqt-archiver/lxqt-archiver-0.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ SLOT="0" BDEPEND=" >=dev-qt/linguist-tools-5.15:5 - >=dev-util/lxqt-build-tools-0.11.0 + >=dev-util/lxqt-build-tools-0.13.0 " DEPEND=" dev-libs/glib:2 @@ -32,7 +32,7 @@ DEPEND=" >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 - >=x11-libs/libfm-qt-1.1:= + >=x11-libs/libfm-qt-1.4:= " RDEPEND="${DEPEND}" diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.7.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.9.1.ebuild index 064d57260eb4..c5fe417b24b6 100644 --- a/app-arch/lxqt-archiver/lxqt-archiver-0.7.0.ebuild +++ b/app-arch/lxqt-archiver/lxqt-archiver-0.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~loong ~riscv x86" + KEYWORDS="~amd64 ~loong ~riscv ~x86" fi LICENSE="GPL-2 GPL-2+" @@ -23,7 +23,7 @@ SLOT="0" BDEPEND=" >=dev-qt/linguist-tools-5.15:5 - >=dev-util/lxqt-build-tools-0.12.0 + >=dev-util/lxqt-build-tools-0.13.0 " DEPEND=" dev-libs/glib:2 @@ -32,7 +32,7 @@ DEPEND=" >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 - >=x11-libs/libfm-qt-1.2:= + >=x11-libs/libfm-qt-1.4:= " RDEPEND="${DEPEND}" diff --git a/app-arch/lz4/lz4-1.9.4.ebuild b/app-arch/lz4/lz4-1.9.4.ebuild index 21d4bec17b7e..05adb1eacb6a 100644 --- a/app-arch/lz4/lz4-1.9.4.ebuild +++ b/app-arch/lz4/lz4-1.9.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-2 GPL-2" # https://abi-laboratory.pro/tracker/timeline/lz4/ SLOT="0/r132" -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 ~sparc64-solaris ~x64-solaris ~x86-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="static-libs" CMAKE_USE_DIR=${S}/build/cmake diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest index 8a9706d2316c..0a3c51fd9323 100644 --- a/app-arch/lzip/Manifest +++ b/app-arch/lzip/Manifest @@ -1,2 +1,2 @@ -DIST lzip-1.23.tar.gz 121817 BLAKE2B 934a35e31b0db76c4dcbe2fe903f04b60471485118aa5d4001599a3c23a7db74f05f703cf430bb299795be7025f71efb225afddff85c8245e962bdadcf82aef7 SHA512 482804205b6e92fdf9cb17fb9482df7987227c7b1bef9e42d78787acfabe73995f5b1a66f847d2176423f22dce56f1122c5b1c9670f0b778c0bdad2852369c85 -DIST lzip-1.23.tar.gz.sig 72 BLAKE2B 2441968deb279c25724d854cf13c2601c8a62619e9350dc063051b8c7d86a978ef39e91d7ba680152080ab537976677d3ea2fbb2071ce8a95b8f12dc65777cf3 SHA512 e49542558c8424036b5aaab348b3baa133b9b2d0ec5f8fc19557b83acb2cdbab3909d8eb51a9dd111750ae1dd81bafc2a1a4c4be4a46e8f149386c42f4ec79ce +DIST lzip-1.24.1.tar.gz 123899 BLAKE2B b387577087af5596ea49af16c44e1dfc11f78cbcc1031fc480a4e7ef1a01f4d8fb35c03d8cbeb7f6feb51e427708b1ed0f9a160e80ff938555ea3cf34f28be7c SHA512 b67b3b8ab594306dd863b6f51525ab80e90cbff3af1faf190fd7a35eac895ef869e6a1f8f503d623c16ad5c1496816c8f851abf0be5983d53052bea80afc34bd +DIST lzip-1.24.1.tar.gz.sig 72 BLAKE2B 6b957524cbca62aed7eb1dc35284da24550d8d90c8bf95d0c84063afe5e0cc1fc6f70bd513dece615f286e0d49c1a7dfcf6940a443f293975380c8e3ada2cb2d SHA512 40cfa84a7c7e6b907d76560eae27b22cb11aea79a94a2231e041952fe0f452a4e291355f60965bd6ca712e03f4ebf5381b759409e66a4a12653a005a6a1d8395 diff --git a/app-arch/lzip/lzip-1.23.ebuild b/app-arch/lzip/lzip-1.24.1.ebuild index 325d1c10f21c..8d1cf3e805da 100644 --- a/app-arch/lzip/lzip-1.23.ebuild +++ b/app-arch/lzip/lzip-1.24.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/antoniodiazdiaz.asc inherit toolchain-funcs verify-sig DESCRIPTION="Lossless data compressor based on the LZMA algorithm" @@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_/-}" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )" diff --git a/app-arch/lziprecover/Manifest b/app-arch/lziprecover/Manifest index 6a5b5909e44f..be787d9ba915 100644 --- a/app-arch/lziprecover/Manifest +++ b/app-arch/lziprecover/Manifest @@ -1,2 +1,2 @@ -DIST lziprecover-1.23.tar.gz 156147 BLAKE2B 71a210c7143ff6f0f8b9cce7d5a1b6f681f8331fb971fa2836dfd04ad50e732ab595a415a9b8a3020c70c884c7e7fce5c605e63e0f28ea94f2de9d5447199a83 SHA512 9f2d40311f901c2c00fa6b106a2363dfcd7b6c73ae86282733d7c3451237ee30f6d5cce035ab5ba63300eea637eeb3ac5db7e7571bdef1bef259b801b10f1c7a -DIST lziprecover-1.23.tar.gz.sig 72 BLAKE2B fcddac3243d69a77847393d69b7447faac36850e74cfa97336e30e581b840badcce66d1e7900a2d2c6bf9f5c3fcd1e04470087e1c5aaf885f198021c8b64323d SHA512 2a54258cad2b043375f1fad6f2a7bb736276ffc7e4ec3b7ac73b33f3a5ec74a419e2ed7493d3266c4a17437d7d6591d21ac319ed5c5c5565e8bc149d8d424a44 +DIST lziprecover-1.24.tar.gz 161471 BLAKE2B b96bba4aff4423c8681ae5c86efa66af61ee88b50050e262959b51c22927c594a8f5ca8f3d59a46ddae842a5078fe2ed955e279a412708247f7dd3140e6763b7 SHA512 b1f126fa24b1627c6e98ba8fa4fc30dac248f81f92be12f1063db6e40fd9c6f9f8b5a2306bde72f30623a64de5befec28b34073309f393317b56a38527947466 +DIST lziprecover-1.24.tar.gz.sig 72 BLAKE2B 8f4aa191b19e92c225138331f278bb907cf823917ee528ec3f9da9fa75abcc94eea4d676979d7b914fe099b7bed49c1feccf6e9fb069a873ad3b723a4e65af85 SHA512 d708a0573d9a46b92d59c08a988068735e0f76316896489f2ce0585d09f0178718bdd5fd59dc869c7314ba8fb64c4c4aa73eb8e226db1564cbc964422bde13e4 diff --git a/app-arch/lziprecover/lziprecover-1.23.ebuild b/app-arch/lziprecover/lziprecover-1.24.ebuild index c5a00e27d82e..df9656261aa1 100644 --- a/app-arch/lziprecover/lziprecover-1.23.ebuild +++ b/app-arch/lziprecover/lziprecover-1.24.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/antoniodiazdiaz.asc inherit toolchain-funcs verify-sig DESCRIPTION="Lziprecover is a data recovery tool and decompressor for lzip compressed files" @@ -15,8 +15,13 @@ S="${WORKDIR}/${P/_/-}" LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 x86" +IUSE="test" +RESTRICT="!test? ( test )" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )" +BDEPEND=" + test? ( app-arch/lzip ) + verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz ) +" src_configure() { # not autotools-based diff --git a/app-arch/lzlib/Manifest b/app-arch/lzlib/Manifest index 16f6a28c6838..de0cfa78feec 100644 --- a/app-arch/lzlib/Manifest +++ b/app-arch/lzlib/Manifest @@ -1,2 +1,2 @@ -DIST lzlib-1.13.tar.gz 130005 BLAKE2B 88721890f111c2bb1901329e9cc39e7f581c220bb58bbc93098c34984b7557a80adff236f5755057099870ba20201f6b692925080b97965b4612d221d21cb33c SHA512 b9c4e5a9aca982984b497d1da2e1f0439b37b19acaf88a02f5af114b0a65a828c5ae235b3bd4f419ce001963de38a4d03445a6a1bd93f37e783e799abd75578d -DIST lzlib-1.13.tar.gz.sig 72 BLAKE2B 66d7a9939a5e23874a6927545f265cf315d634a166d7f22cbe4f09ab88dbae778aa9c6f77e6d5e51fbaadc9a503f735fb2bc834475089a6046782f9af22b472f SHA512 1db7a91b3a84d70874c0ec92b2764ab6805e20a351438b975f4e72dd6a1dbe5a4448d47af2bb6d056bde9c6102df375454724d536efbdaa90cd7dbf08eb01c81 +DIST lzlib-1.14.tar.gz 131624 BLAKE2B d975fece48d92be354202581a5be5c709b8acdbb41b3782ec0a79939278ada42aa6765bcef7a1cb70bfb7808b8a88d5e6ed48924f13fcc291a4a0d2057f0f4bf SHA512 1582b99149af18ea119f015a9dbf224aa2ebc78240432415b2da20bd5a4e4dc3fdea2489789bc581bdccdba6f4eab13c69c5801e8a43ab9a829c2eb9b801797f +DIST lzlib-1.14.tar.gz.sig 72 BLAKE2B 104d914d4b85bab0457017ab5663962ac1573dac421e11a94eaa9e77f6338501c96444d45e1e4101e9ea48409c2b30037a7b07c2a188cff6fcf47c6d067d1398 SHA512 852ebd4a460021e642a673a8c6d88b25a2b45dff4a45f7ccfc6bbb531be3c967b8e01308aa35088c843002561c1c4b813a47ff4b0fd4417ebf12f188af8d36be diff --git a/app-arch/lzlib/lzlib-1.13-r1.ebuild b/app-arch/lzlib/lzlib-1.14.ebuild index 8544568472f3..12043b864bb4 100644 --- a/app-arch/lzlib/lzlib-1.13-r1.ebuild +++ b/app-arch/lzlib/lzlib-1.14.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/antoniodiazdiaz.asc inherit toolchain-funcs verify-sig DESCRIPTION="Library for lzip compression" @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/$ LICENSE="libstdc++" # fancy form of GPL-2+ with library exception SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )" @@ -24,6 +24,7 @@ src_configure() { --disable-ldconfig --prefix="${EPREFIX}"/usr --libdir='$(prefix)'/$(get_libdir) + AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" diff --git a/app-arch/lzop/lzop-1.04-r1.ebuild b/app-arch/lzop/lzop-1.04-r1.ebuild index faf1bd92c906..f8a665211ba0 100644 --- a/app-arch/lzop/lzop-1.04-r1.ebuild +++ b/app-arch/lzop/lzop-1.04-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="https://www.lzop.org/download/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=">=dev-libs/lzo-2" DEPEND="${RDEPEND}" diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest index 4c489fab56ef..87361737f561 100644 --- a/app-arch/makeself/Manifest +++ b/app-arch/makeself/Manifest @@ -1 +1 @@ -DIST makeself-2.4.5.tar.gz 39012 BLAKE2B f79cf1c087e89c4fd09f328fb795a3f8a78ee38060dbbd1590e3dcdf22a346b0c12bf6837d1636efadb2a66f6a762308de7ee9dd2fc62a7c88d417d257c5f0f6 SHA512 1dae74586f6bd5afb526801b7ffa7fc7962ff74b0f190cdd51da93c21421864b72f5fe18090cb2ff6ad27f0907fbf3aeb5545f3f70e33dbc9e505a78505f5f90 +DIST makeself-2.5.0.tar.gz 43996 BLAKE2B 60e5b7a55bd03e45d25753600ddb4e0e15f05eabc95db18f1a9da10308d018bb913ba1e8bc264c3bd828c3d229aca34fae4ab1682bf6cf59c591a6fdef186061 SHA512 cd0ce98579f00a02f9559848b39e0a6efea9df1866073d419f0b6560034cc186ed8315f8b4589e03f626b040727d9ae646bc2abaebe4f4da556b87617bdd770f diff --git a/app-arch/makeself/makeself-2.4.5.ebuild b/app-arch/makeself/makeself-2.5.0.ebuild index 57a66dd9848b..286161726b85 100644 --- a/app-arch/makeself/makeself-2.4.5.ebuild +++ b/app-arch/makeself/makeself-2.5.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 inherit optfeature @@ -26,10 +26,11 @@ src_install() { dobin makeself-header.sh makeself.sh dosym makeself.sh /usr/bin/makeself doman makeself.1 - dodoc README.md makeself.lsm + dodoc README.md } pkg_postinst() { + optfeature "bzip3 support" app-arch/bzip3 optfeature "lz4 support" app-arch/lz4 optfeature "lzop support" app-arch/lzop optfeature "pbzip2 support" app-arch/pbzip2 diff --git a/app-arch/mscompress/mscompress-0.3-r1.ebuild b/app-arch/mscompress/mscompress-0.3-r1.ebuild index 779b372736d4..eb684b82abbc 100644 --- a/app-arch/mscompress/mscompress-0.3-r1.ebuild +++ b/app-arch/mscompress/mscompress-0.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit flag-o-matic toolchain-funcs DESCRIPTION="Microsoft compress.exe/expand.exe compatible (de)compressor" -HOMEPAGE="http://gnuwin32.sourceforge.net/packages/mscompress.htm" +HOMEPAGE="https://gnuwin32.sourceforge.net/packages/mscompress.htm" SRC_URI="ftp://ftp.penguin.cz/pub/users/mhi/mscompress/${P}.tar.bz2" LICENSE="GPL-2" diff --git a/app-arch/ncompress/ncompress-5.0-r1.ebuild b/app-arch/ncompress/ncompress-5.0-r1.ebuild index 2b3cfe61914e..aad48b1bec95 100644 --- a/app-arch/ncompress/ncompress-5.0-r1.ebuild +++ b/app-arch/ncompress/ncompress-5.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" src_prepare() { diff --git a/app-arch/ncompress/ncompress-5.0.ebuild b/app-arch/ncompress/ncompress-5.0.ebuild deleted file mode 100644 index dacdcbd8a783..000000000000 --- a/app-arch/ncompress/ncompress-5.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit toolchain-funcs - -DESCRIPTION="Classic compress & uncompress programs for .Z (LZW) files" -HOMEPAGE="https://vapier.github.io/ncompress/" -SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -src_prepare() { - default - sed -i 's:\bln :ln -s :' Makefile.def || die -} - -src_configure() { - tc-export CC -} - -src_install() { - emake install_core DESTDIR="${ED}" PREFIX="/usr" - dodoc Acknowleds Changes LZW.INFO README.md -} diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest index 29b37f25e4d4..c03f71b7e19b 100644 --- a/app-arch/p7zip/Manifest +++ b/app-arch/p7zip/Manifest @@ -1 +1,2 @@ +DIST p7zip-17.05.tar.gz 6722154 BLAKE2B 0bcba638d3acaf2aa270e02693ad4295dfcc6b388037bdb446e25f3f4e1cb34f1b05bbc9a845364ca770625c32b2d7f55f63f504ad8e0863fff4bf940ae1fddd SHA512 97a7cfd15287998eb049c320548477be496c4ddf6b45c833c42adca4ab88719b07a442ae2e71cf2dc3b30a0777a3acab0a1a30f01fd85bacffa3fa9bd22c3f7d DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f diff --git a/app-arch/p7zip/files/p7zip-17.05-natspec.patch b/app-arch/p7zip/files/p7zip-17.05-natspec.patch new file mode 100644 index 000000000000..7487924af306 --- /dev/null +++ b/app-arch/p7zip/files/p7zip-17.05-natspec.patch @@ -0,0 +1,117 @@ +commit f25f0b75bbeb485961dc139aed6b5b474552d043 (HEAD -> main) +Author: Taiki Sugawara <buzz.taiki@gmail.com> +Date: Wed May 12 18:26:11 2021 +0900 + + natspec patch for p7zip 17.x + +diff --git a/CPP/7zip/Archive/Zip/ZipItem.cpp b/CPP/7zip/Archive/Zip/ZipItem.cpp +index 353e895..44071f3 100644 +--- a/CPP/7zip/Archive/Zip/ZipItem.cpp ++++ b/CPP/7zip/Archive/Zip/ZipItem.cpp +@@ -1,9 +1,7 @@ + // Archive/ZipItem.cpp + +-#if (!defined _WIN32) && (!defined __CYGWIN__) && (!defined __APPLE__) + #include <iconv.h> +-#include <locale.h> +-#endif ++#include <natspec.h> + + #include "StdAfx.h" + +@@ -355,87 +353,15 @@ void CItem::GetUnicodeString(UString &res, const AString &s, bool isComment, boo + #endif + } + +- #if (!defined _WIN32) && (!defined __CYGWIN__) && (!defined __APPLE__) +- // Convert OEM char set to UTF-8 if needed +- // Use system locale to select code page +- +- Byte hostOS = GetHostOS(); +- if (!isUtf8 && ((hostOS == NFileHeader::NHostOS::kFAT) || (hostOS == NFileHeader::NHostOS::kNTFS))) { +- +- const char *oemcp; +- oemcp = getenv("OEMCP"); +- if (!oemcp) { +- oemcp = "CP437\0"; // CP name is 6 chars max +- +- const char *lc_to_cp_table[] = { +- "af_ZA", "CP850", "ar_SA", "CP720", "ar_LB", "CP720", "ar_EG", "CP720", +- "ar_DZ", "CP720", "ar_BH", "CP720", "ar_IQ", "CP720", "ar_JO", "CP720", +- "ar_KW", "CP720", "ar_LY", "CP720", "ar_MA", "CP720", "ar_OM", "CP720", +- "ar_QA", "CP720", "ar_SY", "CP720", "ar_TN", "CP720", "ar_AE", "CP720", +- "ar_YE", "CP720","ast_ES", "CP850", "az_AZ", "CP866", "az_AZ", "CP857", +- "be_BY", "CP866", "bg_BG", "CP866", "br_FR", "CP850", "ca_ES", "CP850", +- "zh_CN", "CP936", "zh_TW", "CP950", "kw_GB", "CP850", "cs_CZ", "CP852", +- "cy_GB", "CP850", "da_DK", "CP850", "de_AT", "CP850", "de_LI", "CP850", +- "de_LU", "CP850", "de_CH", "CP850", "de_DE", "CP850", "el_GR", "CP737", +- "en_AU", "CP850", "en_CA", "CP850", "en_GB", "CP850", "en_IE", "CP850", +- "en_JM", "CP850", "en_BZ", "CP850", "en_PH", "CP437", "en_ZA", "CP437", +- "en_TT", "CP850", "en_US", "CP437", "en_ZW", "CP437", "en_NZ", "CP850", +- "es_PA", "CP850", "es_BO", "CP850", "es_CR", "CP850", "es_DO", "CP850", +- "es_SV", "CP850", "es_EC", "CP850", "es_GT", "CP850", "es_HN", "CP850", +- "es_NI", "CP850", "es_CL", "CP850", "es_MX", "CP850", "es_ES", "CP850", +- "es_CO", "CP850", "es_ES", "CP850", "es_PE", "CP850", "es_AR", "CP850", +- "es_PR", "CP850", "es_VE", "CP850", "es_UY", "CP850", "es_PY", "CP850", +- "et_EE", "CP775", "eu_ES", "CP850", "fa_IR", "CP720", "fi_FI", "CP850", +- "fo_FO", "CP850", "fr_FR", "CP850", "fr_BE", "CP850", "fr_CA", "CP850", +- "fr_LU", "CP850", "fr_MC", "CP850", "fr_CH", "CP850", "ga_IE", "CP437", +- "gd_GB", "CP850", "gv_IM", "CP850", "gl_ES", "CP850", "he_IL", "CP862", +- "hr_HR", "CP852", "hu_HU", "CP852", "id_ID", "CP850", "is_IS", "CP850", +- "it_IT", "CP850", "it_CH", "CP850", "iv_IV", "CP437", "ja_JP", "CP932", +- "kk_KZ", "CP866", "ko_KR", "CP949", "ky_KG", "CP866", "lt_LT", "CP775", +- "lv_LV", "CP775", "mk_MK", "CP866", "mn_MN", "CP866", "ms_BN", "CP850", +- "ms_MY", "CP850", "nl_BE", "CP850", "nl_NL", "CP850", "nl_SR", "CP850", +- "nn_NO", "CP850", "nb_NO", "CP850", "pl_PL", "CP852", "pt_BR", "CP850", +- "pt_PT", "CP850", "rm_CH", "CP850", "ro_RO", "CP852", "ru_RU", "CP866", +- "sk_SK", "CP852", "sl_SI", "CP852", "sq_AL", "CP852", "sr_RS", "CP855", +- "sr_RS", "CP852", "sv_SE", "CP850", "sv_FI", "CP850", "sw_KE", "CP437", +- "th_TH", "CP874", "tr_TR", "CP857", "tt_RU", "CP866", "uk_UA", "CP866", +- "ur_PK", "CP720", "uz_UZ", "CP866", "uz_UZ", "CP857", "vi_VN", "CP1258", +- "wa_BE", "CP850", "zh_HK", "CP950", "zh_SG", "CP936"}; +- int table_len = sizeof(lc_to_cp_table) / sizeof(char *); +- int lc_len, i; +- +- char *lc = setlocale(LC_CTYPE, ""); +- +- if (lc && lc[0]) { +- // Compare up to the dot, if it exists, e.g. en_US.UTF-8 +- for (lc_len = 0; lc[lc_len] != '.' && lc[lc_len] != '\0'; ++lc_len) +- ; +- for (i = 0; i < table_len; i += 2) +- if (strncmp(lc, lc_to_cp_table[i], lc_len) == 0) +- oemcp = lc_to_cp_table[i + 1]; +- } +- } +- +- iconv_t cd; +- if ((cd = iconv_open("UTF-8", oemcp)) != (iconv_t)-1) { +- +- AString s_utf8; +- const char* src = s.Ptr(); +- size_t slen = s.Len(); +- size_t dlen = slen * 4; +- const char* dest = s_utf8.GetBuf_SetEnd(dlen + 1); // (source length * 4) + null termination +- +- size_t done = iconv(cd, (char**)&src, &slen, (char**)&dest, &dlen); +- bzero((size_t*)dest + done, 1); +- +- iconv_close(cd); +- +- if (ConvertUTF8ToUnicode(s_utf8, res) || ignore_Utf8_Errors) +- return; +- } ++ if (!isUtf8) { ++ const char *oem_charset = natspec_get_charset_by_locale(NATSPEC_DOSCS, ""); ++ char *p = natspec_convert(s.Ptr(), NULL, oem_charset, 0); ++ AString utf = p; ++ free(p); ++ if (ConvertUTF8ToUnicode(utf, res)) ++ return; + } +- #endif +- ++ + if (isUtf8) + if (ConvertUTF8ToUnicode(s, res) || ignore_Utf8_Errors) + return; diff --git a/app-arch/p7zip/files/p7zip-17.05-unit64.patch b/app-arch/p7zip/files/p7zip-17.05-unit64.patch new file mode 100644 index 000000000000..0aa19e329ac0 --- /dev/null +++ b/app-arch/p7zip/files/p7zip-17.05-unit64.patch @@ -0,0 +1,21 @@ +--- p7zip-17.05-orig/C/hashes/hash.h 2023-03-03 23:16:28.000000000 +1100 ++++ p7zip-17.05/C/hashes/hash.h 2023-04-15 09:05:20.357955971 +1000 +@@ -42,17 +42,7 @@ + + #include "../7zTypes.h" + +-#ifndef _UINT32_T_DECLARED +-typedef UInt32 uint32_t; +-#define _UINT32_T_DECLARED +-#endif +- +-#ifndef _UINT64_T_DECLARED +-typedef UInt64 uint64_t; +-#define _UINT64_T_DECLARED +-#endif +- +-//#include <stdint.h> ++#include <stdint.h> + + #ifndef min + #define min(a,b) (((a)>(b))?(b):(a)) diff --git a/app-arch/p7zip/metadata.xml b/app-arch/p7zip/metadata.xml index 762c5a16f7fe..6a21e35bb813 100644 --- a/app-arch/p7zip/metadata.xml +++ b/app-arch/p7zip/metadata.xml @@ -5,9 +5,10 @@ <email>prometheanfire@gentoo.org</email> </maintainer> <use> + <flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag> <flag name="rar">Enable support for non-free rar decoder</flag> </use> <upstream> - <remote-id type="sourceforge">p7zip</remote-id> + <remote-id type="github">p7zip-project/p7zip</remote-id> </upstream> </pkgmetadata> diff --git a/app-arch/p7zip/p7zip-16.02-r8.ebuild b/app-arch/p7zip/p7zip-16.02-r8.ebuild index d0bf79b50d69..933adee9f26f 100644 --- a/app-arch/p7zip/p7zip-16.02-r8.ebuild +++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,8 +13,8 @@ S="${WORKDIR}/${PN}_${PV}" LICENSE="LGPL-2.1 rar? ( unRAR )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris" -IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="abi_x86_x32 kde +pch rar static wxwidgets" REQUIRED_USE="kde? ( wxwidgets )" RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" @@ -143,9 +143,7 @@ src_install() { doman man1/7z.1 man1/7za.1 man1/7zr.1 dodoc ChangeLog README TODO - if use doc; then - dodoc DOC/*.txt - docinto html - dodoc -r DOC/MANUAL/. - fi + dodoc DOC/*.txt + docinto html + dodoc -r DOC/MANUAL/. } diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild b/app-arch/p7zip/p7zip-17.05-r1.ebuild new file mode 100644 index 000000000000..324ae0051c52 --- /dev/null +++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib toolchain-funcs wrapper xdg + +DESCRIPTION="Port of 7-Zip archiver for Unix" +HOMEPAGE="https://github.com/p7zip-project/p7zip" +SRC_URI="https://github.com/p7zip-project/p7zip/archive/v${PV}.tar.gz -> ${P}.tar.gz" +#S="${WORKDIR}/${PN}-${PV}" + +LICENSE="LGPL-2.1 rar? ( unRAR )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" +IUSE="abi_x86_x32 natspec +pch rar static" + +RDEPEND="natspec? ( dev-libs/libnatspec )" +DEPEND="${RDEPEND}" +BDEPEND=" + abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) + amd64? ( dev-lang/yasm ) + x86? ( dev-lang/nasm )" + +PATCHES=( + "${FILESDIR}/p7zip-17.05-unit64.patch" +) + +src_prepare() { + default + + if use natspec; then + eapply "${FILESDIR}"/${P}-natspec.patch + sed -i '/^LOCAL_LIBS/s/$/ -lnatspec/' makefile.* || die + fi + + if ! use pch; then + sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die + fi + + sed \ + -e 's|-m32 ||g' \ + -e 's|-m64 ||g' \ + -e 's|-pipe||g' \ + -e "/[ALL|OPT]FLAGS/s|-s||;/OPTIMIZE/s|-s||" \ + -e "/CFLAGS=/s|=|+=|" \ + -e "/CXXFLAGS=/s|=|+=|" \ + -i makefile* || die + + # remove non-free RAR codec + if ! use rar; then + sed \ + -e '/Rar/d' \ + -e '/RAR/d' \ + -i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die + rm -r CPP/7zip/Compress/Rar || die + fi + + if use abi_x86_x32; then + sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die + cp -f makefile.linux_amd64_asm makefile.machine || die + elif use amd64; then + cp -f makefile.linux_amd64_asm makefile.machine || die + elif use x86; then + cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die + elif [[ ${CHOST} == *-darwin* ]] ; then + # Mac OS X needs this special makefile, because it has a non-GNU + # linker, it doesn't matter so much for bitwidth, for it doesn't + # do anything with it + cp -f makefile.macosx_llvm_64bits makefile.machine || die + # bundles have extension .bundle but don't die because USE=-rar + # removes the Rar directory + sed -i -e '/strcpy(name/s/\.so/.bundle/' \ + CPP/Windows/DLL.cpp || die + sed -i -e '/^PROG=/s/\.so/.bundle/' \ + CPP/7zip/Bundles/Format7zFree/makefile.list \ + $(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die + fi + + if use static; then + sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die + fi +} + +src_compile() { + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" all3 +} + +src_test() { + emake test test_7z test_7zr +} + +src_install() { + # these wrappers cannot be symlinks, p7zip should be called with full path + make_wrapper 7zr /usr/$(get_libdir)/p7zip/7zr + make_wrapper 7za /usr/$(get_libdir)/p7zip/7za + make_wrapper 7z /usr/$(get_libdir)/p7zip/7z + + dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip + doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 + + exeinto /usr/$(get_libdir)/p7zip + doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx + doexe bin/*$(get_modname) + if use rar; then + exeinto /usr/$(get_libdir)/p7zip/Codecs + doexe bin/Codecs/*$(get_modname) + fi + + doman man1/7z.1 man1/7za.1 man1/7zr.1 + + dodoc ChangeLog README TODO + dodoc DOC/*.txt + docinto html + dodoc -r DOC/MANUAL/. +} diff --git a/app-arch/pack/pack-0.0.0.1.ebuild b/app-arch/pack/pack-0.0.0.1.ebuild index e02651bdace9..811e9dd596ad 100644 --- a/app-arch/pack/pack-0.0.0.1.ebuild +++ b/app-arch/pack/pack-0.0.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P} LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64 ~x86" RDEPEND=" dev-lang/ghc:= diff --git a/app-arch/par2cmdline-turbo/Manifest b/app-arch/par2cmdline-turbo/Manifest new file mode 100644 index 000000000000..8156c6fb577c --- /dev/null +++ b/app-arch/par2cmdline-turbo/Manifest @@ -0,0 +1,2 @@ +DIST par2cmdline-turbo-1.1.0.tar.gz 3879570 BLAKE2B 25aae3f30af8fd50d3acf34807151a4f948d2e54699c9c62ace3ac13376d680e1714f24bf2899f70cf58f59db85eb7278e96a8c9a926314e557567e5782acd8e SHA512 2999d21d446502ddc6c145dfa9f005d4f6bb5afcf7c40975759214c37936d0def7194c92b21591ee09845de43e8c4fbe14ae9f2a6401fbfe35c523cf2890103c +DIST par2cmdline-turbo-1.1.1.tar.gz 3937861 BLAKE2B 3c7829bff1148ca4eab2259664827c491b0802cd76b95119f0381f4c8eb1532ff7207293b740a8e5ecd2a515f59f60696ddf0ce7e6b50f637f49495b852912af SHA512 bb919f885134a298ba14551e21cf89a91aee292e437133e6973bef09fb5dee9a9b45e76a59320bfede864438d3ac884699be7ca3f7234896a9da14cb07ffa89d diff --git a/app-arch/par2cmdline-turbo/metadata.xml b/app-arch/par2cmdline-turbo/metadata.xml new file mode 100644 index 000000000000..68bcf59d48c5 --- /dev/null +++ b/app-arch/par2cmdline-turbo/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>joe@wt.gd</email> + <name>Joe Kappus</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">animetosho/par2cmdline-turbo</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-arch/par2cmdline-turbo/par2cmdline-turbo-1.1.0.ebuild b/app-arch/par2cmdline-turbo/par2cmdline-turbo-1.1.0.ebuild new file mode 100644 index 000000000000..b696866e2dc9 --- /dev/null +++ b/app-arch/par2cmdline-turbo/par2cmdline-turbo-1.1.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/animetosho/par2cmdline-turbo" +else + SRC_URI="https://github.com/animetosho/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +DESCRIPTION="par2cmdline × ParPar: speed focused par2cmdline fork" +HOMEPAGE="https://github.com/animetosho/par2cmdline-turbo" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="openmp" + +RDEPEND=" + !app-arch/par2cmdline +" + +src_prepare() { + default + eautoreconf +} diff --git a/app-arch/par2cmdline-turbo/par2cmdline-turbo-1.1.1.ebuild b/app-arch/par2cmdline-turbo/par2cmdline-turbo-1.1.1.ebuild new file mode 100644 index 000000000000..b696866e2dc9 --- /dev/null +++ b/app-arch/par2cmdline-turbo/par2cmdline-turbo-1.1.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/animetosho/par2cmdline-turbo" +else + SRC_URI="https://github.com/animetosho/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +DESCRIPTION="par2cmdline × ParPar: speed focused par2cmdline fork" +HOMEPAGE="https://github.com/animetosho/par2cmdline-turbo" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="openmp" + +RDEPEND=" + !app-arch/par2cmdline +" + +src_prepare() { + default + eautoreconf +} diff --git a/app-arch/par2cmdline-turbo/par2cmdline-turbo-9999.ebuild b/app-arch/par2cmdline-turbo/par2cmdline-turbo-9999.ebuild new file mode 100644 index 000000000000..b696866e2dc9 --- /dev/null +++ b/app-arch/par2cmdline-turbo/par2cmdline-turbo-9999.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/animetosho/par2cmdline-turbo" +else + SRC_URI="https://github.com/animetosho/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +DESCRIPTION="par2cmdline × ParPar: speed focused par2cmdline fork" +HOMEPAGE="https://github.com/animetosho/par2cmdline-turbo" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="openmp" + +RDEPEND=" + !app-arch/par2cmdline +" + +src_prepare() { + default + eautoreconf +} diff --git a/app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild b/app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild new file mode 100644 index 000000000000..e026448f3a80 --- /dev/null +++ b/app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A PAR-2.0 file verification and repair tool" +HOMEPAGE="https://github.com/Parchive/par2cmdline" +SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="openmp" + +PATCHES=( "${FILESDIR}"/${P}-big-endian.patch ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + econf $(use_enable openmp) +} diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest index cdc0a89ce575..2bf03b744632 100644 --- a/app-arch/patool/Manifest +++ b/app-arch/patool/Manifest @@ -1 +1,4 @@ -DIST patool-1.12.tar.gz 69146 BLAKE2B e97f64b4ba41860c1f7e506f63f249adeb02974b71bf83eb1673ae1fd93b8f9b698818cb57f961b3d3a5d4e445c5e7a3a349db54e1eb11a8fc165ad07722ace9 SHA512 b8c67526ce79448de703b03ca9b363c0e04cfe56bfc6168bcb96202f95022b6bbcaa92be86a85ee9608070206acd09382b0dfd08a2f805c5e8e5683c7c3f18cc +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/metadata.xml b/app-arch/patool/metadata.xml index 143d6f45cf1c..198fc346c99a 100644 --- a/app-arch/patool/metadata.xml +++ b/app-arch/patool/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>parona@protonmail.com</email> + <name>Alfred Wingate</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="pypi">patool</remote-id> <remote-id type="github">wummel/patool</remote-id> diff --git a/app-arch/patool/patool-1.12.ebuild b/app-arch/patool/patool-1.12.ebuild deleted file mode 100644 index b41af1cb9439..000000000000 --- a/app-arch/patool/patool-1.12.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit distutils-r1 - -DESCRIPTION="Portable archive file manager" -HOMEPAGE="http://wummel.github.io/patool/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" diff --git a/app-arch/patool/patool-1.15.0.ebuild b/app-arch/patool/patool-1.15.0.ebuild new file mode 100644 index 000000000000..2aafb392ada6 --- /dev/null +++ b/app-arch/patool/patool-1.15.0.ebuild @@ -0,0 +1,129 @@ +# 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 new file mode 100644 index 000000000000..2aafb392ada6 --- /dev/null +++ b/app-arch/patool/patool-2.0.0.ebuild @@ -0,0 +1,129 @@ +# 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 new file mode 100644 index 000000000000..101960679d5f --- /dev/null +++ b/app-arch/patool/patool-2.1.1.ebuild @@ -0,0 +1,128 @@ +# 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 new file mode 100644 index 000000000000..101960679d5f --- /dev/null +++ b/app-arch/patool/patool-2.2.0.ebuild @@ -0,0 +1,128 @@ +# 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/pax/pax-20201030.ebuild b/app-arch/pax/pax-20201030.ebuild index af1a475b6593..b22da9159947 100644 --- a/app-arch/pax/pax-20201030.ebuild +++ b/app-arch/pax/pax-20201030.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND="elibc_musl? ( sys-libs/fts-standalone )" DEPEND="${RDEPEND}" diff --git a/app-arch/pdlzip/Manifest b/app-arch/pdlzip/Manifest index fbd572985d53..a37f3abf8412 100644 --- a/app-arch/pdlzip/Manifest +++ b/app-arch/pdlzip/Manifest @@ -1,2 +1,2 @@ -DIST pdlzip-1.12.tar.gz 74125 BLAKE2B 41ae5878d75c0bcfad5b71194b58950d91281a5a20e67b9081b9ef6f852bf9467bd512c72a1af873b15bf84360273091d05ab6283ba0f3a725bd5fc17746f821 SHA512 0472c725db187c984f8874d039c53bd961a8d510ee03ea0b6b9e19ee2d8e7addadd06fc7715a58adfe8335c90ea697640c751cdfaf0007e40c94408a0bf8ed72 -DIST pdlzip-1.12.tar.gz.sig 72 BLAKE2B c7f95cc45493402e862068e78921729c39436729599fe41dabcedabbf7ebade0ac140b73e208cc3d4f776622668c339f23b06b8b55547c0b9c55ccaff154842d SHA512 45ebc9438705a242fb1948e74b5e27f1ef336b67549a8e279c015c1e01107fd565e68c11426467f60a17e0ee65362a59e765ec118a80b875865fd429bbd80b80 +DIST pdlzip-1.13.tar.gz 74681 BLAKE2B 459b1be6c1526c9fe10f9208f7e9ecb0316304ff7d484991fd4a6c786efcef7ff46ce1e5f11c2df5aab403ebe047baf2c3f037b77b67f0601f176e718c61849e SHA512 3fdcfb3be40df564163fd429cefddaccc0b0dc487e8c9c0fb6ca79a26a875f6cfb3cf051b3a155467b333a54b7512ce1604249ae5b198414da5757b723110dd5 +DIST pdlzip-1.13.tar.gz.sig 72 BLAKE2B 666f80542b88c41af8a5e4b9df459ae2c804fd0500997092389efbc7c2f8ae615805a9fe915066eef77b3052fc75a21ec077500767679a9c8460c25adc4f688b SHA512 8b70f96c38db86f6d2dded432bad50875d29abeacc587db1ab6cdacb9c684130a46ca07abaf030e95cf09ac9bdd9ecc14a2360979e928194a9345525dcf1a191 diff --git a/app-arch/pdlzip/pdlzip-1.12.ebuild b/app-arch/pdlzip/pdlzip-1.13.ebuild index 764dcede6f8a..550b7b157c6b 100644 --- a/app-arch/pdlzip/pdlzip-1.12.ebuild +++ b/app-arch/pdlzip/pdlzip-1.13.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/antoniodiazdiaz.asc inherit toolchain-funcs verify-sig DESCRIPTION="Public-domain version of lzip compressor" @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/$ LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~mips ~x86" +KEYWORDS="amd64 ~mips x86" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )" diff --git a/app-arch/pdv/files/pdv-1.5.1-missing-prototype.patch b/app-arch/pdv/files/pdv-1.5.1-missing-prototype.patch new file mode 100644 index 000000000000..d35ddedfda74 --- /dev/null +++ b/app-arch/pdv/files/pdv-1.5.1-missing-prototype.patch @@ -0,0 +1,19 @@ +Add missing prototype to a common header file. + +Bug: https://bugs.gentoo.org/882157 + +diff --git a/X11/xmpdvmkpkg.h b/X11/xmpdvmkpkg.h +index abaaa47..fd6c6f5 100644 +--- a/X11/xmpdvmkpkg.h ++++ b/X11/xmpdvmkpkg.h +@@ -76,6 +76,7 @@ extern Widget g_statusw; + void spectowidgets(void); + void widgetstospec(struct pdvspec_st *spec); + int cmpspecandwidgets(void); ++void statusmsg(char *fmt, ...); + void xu_SetMainTitle(const char *newtitle, const char *newprefix + , Widget topshell); + +-- +2.41.0 + diff --git a/app-arch/pdv/files/pdv-1.5.1-no-strip.patch b/app-arch/pdv/files/pdv-1.5.1-no-strip.patch index 630bf5eb7c36..4beaeb1c4889 100644 --- a/app-arch/pdv/files/pdv-1.5.1-no-strip.patch +++ b/app-arch/pdv/files/pdv-1.5.1-no-strip.patch @@ -1,13 +1,12 @@ -diff -ur pdv-1.5.1-orig/pdv.c pdv-1.5.1/pdv.c ---- pdv-1.5.1-orig/Makefile.in 2008-12-06 23:17:46.000000000 -0800 -+++ pdv-1.5.1/Makefile.in 2008-12-06 23:18:37.000000000 -0800 -@@ -536,7 +536,8 @@ +diff --git a/extra.mk b/extra.mk +index 65f6e72..e681adb 100644 +--- a/extra.mk ++++ b/extra.mk +@@ -11,7 +11,6 @@ pdv_fixed.c : Makefile touch $@ pdv_fixed : pdv_fixed.c pdv - $(STRIPBIN) pdv -+ # let portage decide whether to strip binaries -+ #$(STRIPBIN) pdv printf "%-5.5s" $$VERSION >> pdv printf "\000\000\000\000\000\000\000\000" >> pdv sleep 1 diff --git a/app-arch/pdv/pdv-1.5.1-r4.ebuild b/app-arch/pdv/pdv-1.5.1-r5.ebuild index b50f939fa91a..dc90318206d0 100644 --- a/app-arch/pdv/pdv-1.5.1-r4.ebuild +++ b/app-arch/pdv/pdv-1.5.1-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 inherit autotools toolchain-funcs DESCRIPTION="build a self-extracting and self-installing binary package" -HOMEPAGE="https://sourceforge.net/projects/pdv" +HOMEPAGE="https://sourceforge.net/projects/pdv/" SRC_URI="mirror://sourceforge/pdv/${P}.tar.gz" LICENSE="MIT" @@ -34,13 +34,15 @@ PATCHES=( "${FILESDIR}"/${P}-default-args.patch # prevent pre-stripped binaries "${FILESDIR}"/${P}-no-strip.patch + # missing function prototype, see bug #882157 + "${FILESDIR}"/${P}-missing-prototype.patch ) src_prepare() { default # re-build configure script since patch was applied to configure.in - cd X11 || die + # and to refresh old compiler checks, see bugs #880351 and #906002 eautoreconf } diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest index 785c14e4cc66..4fddcc524d11 100644 --- a/app-arch/pigz/Manifest +++ b/app-arch/pigz/Manifest @@ -1 +1,2 @@ -DIST pigz-2.7.tar.gz 108102 BLAKE2B d391522fd6f8eb6918d671fb1c9517034941f3ae8e05ffcd7bece141e6dae110cde1560bad02bd2bcca2f868cdba2a8a16b5606ad6637d40d5ced5ec9bfffcc8 SHA512 9f9f61de4a0307fc057dc4e31a98bd8d706d9e709ecde0be02a871534fddf6a1fe1321158aa72708603aaaece43f83d2423b127f7689b6219b23aea4f989e8f5 +DIST pigz-2.8.tar.gz 121304 BLAKE2B 9f1ae8b5e0dd9d9b1f17bcdbc41d8a9d50fd9b9ba7c50eb0bc1b738105d05cc396d9ce8e01f58f6b2fa7247a7c7e9926c602a613b1bb3e3a117c8f5c919ce640 SHA512 ae3d9d593e1645d65f9ab77aa828600c9af4bb30d0a073da7ae3dd805e65b87efaf6a0efb980f2d0168e475ae506eba194547d6479956dabb9d88293a9078a7f +DIST pigz-2.8.tar.gz.asc 235 BLAKE2B eb204079597d3e958da3672ba7f92481848bb7824da12b9306ff180add107175bed7bdd435dbc270170769a489c34a033d6ff547e8203cf1d71df6564381b43d SHA512 cb1dbca21d8fed25049693de02abf7489f61407d85f9a52d566c14e0194c6c393aed3edd2fd716d0ecedf7eeead6ae89d0cecc236caacd98740d14bd71e078db diff --git a/app-arch/pigz/files/pigz-2.7-memcpy-ub.patch b/app-arch/pigz/files/pigz-2.7-memcpy-ub.patch deleted file mode 100644 index db53660748b4..000000000000 --- a/app-arch/pigz/files/pigz-2.7-memcpy-ub.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/madler/pigz/commit/e1ed230a1599a3cb64c8f5c003cced60e10e3314 -https://github.com/madler/pigz/issues/107 - -From e1ed230a1599a3cb64c8f5c003cced60e10e3314 Mon Sep 17 00:00:00 2001 -From: Mark Adler <madler@alumni.caltech.edu> -Date: Sat, 31 Dec 2022 21:28:26 -0800 -Subject: [PATCH] Avoid calling memcpy() with a NULL pointer. - -This is not permitted by the C99 standard even when the length is -zero. Go figure. ---- a/pigz.c -+++ b/pigz.c -@@ -3414,8 +3414,10 @@ local int outb(void *desc, unsigned char *buf, unsigned len) { - - // copy the output and alert the worker bees - out_len = len; -- g.out_tot += len; -- memcpy(out_copy, buf, len); -+ if (len) { -+ g.out_tot += len; -+ memcpy(out_copy, buf, len); -+ } - twist(outb_write_more, TO, 1); - twist(outb_check_more, TO, 1); - - diff --git a/app-arch/pigz/metadata.xml b/app-arch/pigz/metadata.xml index 2a434f0824c1..6c4468bab2b9 100644 --- a/app-arch/pigz/metadata.xml +++ b/app-arch/pigz/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> </maintainer> <longdescription lang="en"> pigz, which stands for parallel implementation of gzip, diff --git a/app-arch/pigz/pigz-2.7-r1.ebuild b/app-arch/pigz/pigz-2.7-r1.ebuild deleted file mode 100644 index f0a9d1f4540f..000000000000 --- a/app-arch/pigz/pigz-2.7-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="A parallel implementation of gzip" -HOMEPAGE="https://www.zlib.net/pigz/" -SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris" -IUSE="static test" -RESTRICT="!test? ( test )" - -LIB_DEPEND="sys-libs/zlib[static-libs(+)]" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - test? ( app-arch/ncompress )" - -PATCHES=( - "${FILESDIR}"/${P}-memcpy-ub.patch -) - -src_compile() { - use static && append-ldflags -static - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin ${PN} - dosym ${PN} /usr/bin/un${PN} - dodoc README - doman ${PN}.1 -} diff --git a/app-arch/pigz/pigz-2.7.ebuild b/app-arch/pigz/pigz-2.8.ebuild index 7fed310a0345..3f8b6a274058 100644 --- a/app-arch/pigz/pigz-2.7.ebuild +++ b/app-arch/pigz/pigz-2.8.ebuild @@ -1,25 +1,32 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit toolchain-funcs flag-o-matic +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc +inherit toolchain-funcs flag-o-matic verify-sig DESCRIPTION="A parallel implementation of gzip" HOMEPAGE="https://www.zlib.net/pigz/" -SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz" +SRC_URI=" + https://www.zlib.net/pigz/${P}.tar.gz + verify-sig? ( https://www.zlib.net/pigz/${P}-sig.txt -> ${P}.tar.gz.asc ) +" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos" IUSE="static test" RESTRICT="!test? ( test )" -LIB_DEPEND="sys-libs/zlib[static-libs(+)]" +LIB_DEPEND=">=sys-libs/zlib-1.2.3[static-libs(+)]" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} static? ( ${LIB_DEPEND} ) - test? ( app-arch/ncompress )" + test? ( app-arch/ncompress ) +" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-madler )" src_compile() { use static && append-ldflags -static diff --git a/app-arch/pixz/pixz-1.0.7-r1.ebuild b/app-arch/pixz/pixz-1.0.7-r1.ebuild index 7e591aaa8701..42b11e22d697 100644 --- a/app-arch/pixz/pixz-1.0.7-r1.ebuild +++ b/app-arch/pixz/pixz-1.0.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,6 +36,12 @@ DEPEND=" src_prepare() { default + # We're not interested in linting tests for our purposes (bug #915008) + cat > test/cppcheck-src.sh <<-EOF || die + #!/bin/sh + exit 77 + EOF + [[ ${PV} == "9999" ]] && eautoreconf } diff --git a/app-arch/pixz/pixz-9999.ebuild b/app-arch/pixz/pixz-9999.ebuild index 2fbeeaf35fe3..10a369c58a13 100644 --- a/app-arch/pixz/pixz-9999.ebuild +++ b/app-arch/pixz/pixz-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,6 +36,12 @@ DEPEND=" src_prepare() { default + # We're not interested in linting tests for our purposes (bug #915008) + cat > test/cppcheck-src.sh <<-EOF || die + #!/bin/sh + exit 77 + EOF + [[ ${PV} == "9999" ]] && eautoreconf } diff --git a/app-arch/plzip/Manifest b/app-arch/plzip/Manifest index 1cf5cb5abd59..946d5852dbf0 100644 --- a/app-arch/plzip/Manifest +++ b/app-arch/plzip/Manifest @@ -1,2 +1,2 @@ -DIST plzip-1.10.tar.gz 94541 BLAKE2B deb49345ba3d6b120086aa8646f5684a32e6b64453f2ffc6321011dfd0741ddacca919bb11cba9435a26ea6aa63f453e7c5ff9a7dc7dc38c8ed0c6841237aeef SHA512 7fd7ec288800950deaec9337b3112db72cde059721a0143a091650fc20ba2a3d9d7eebbd7a312e5bbb1a61ca6c902d2450e6c3c7172dccf9c0c8b86db7c2a944 -DIST plzip-1.10.tar.gz.sig 72 BLAKE2B d3d40c1f3618750b375f862ece19badbbe762ea3b704ed346b8779d86b0fd1a881f48910222664a121360c2e7da42b31ab950ecfb01724ab91a60bac2694d705 SHA512 c4be15ee893cce47150f4da5bdb84d6e20ed9c84367508911de2673614e0df182a9e82d1e0be8967ec1e180f1e9be38be976b099fb5428c4df1567cb9bf54ecc +DIST plzip-1.11.tar.gz 96572 BLAKE2B 8de36791390c7b71cd42866a8be4503d601a94ca89a23355be48dff75bf8a6b34b260eea4b1e5ef68e63d20b8dfd6f5acd1e60a9b51290425f22c7a9905469ae SHA512 3a0f0443e68a6b776d85b69ed24d21e03d7bad1b788d6e8f741cc0ebb2537aebde2d68aa6765bcb4d61df6521779af27d176f5ef348014fa3088aa219d5ec691 +DIST plzip-1.11.tar.gz.sig 72 BLAKE2B b7543e93c7736135c95b179472c85226af4b489daa686ede710ac03dc1fb9c3cc31bfcff5452cdf855eb49d00f6548214e94143ed19f8d8420bd05bcb72ae1f9 SHA512 458edf3fb78716cb39164761b2f90cd32011ec2634370791918adc4845b377563f76a32fda9b99e478fb52a0b05c4dc6d4d8df5098da0c95670f205fa4a56511 diff --git a/app-arch/plzip/plzip-1.10.ebuild b/app-arch/plzip/plzip-1.11.ebuild index 2c02e7341fd1..049c9fdd7ab5 100644 --- a/app-arch/plzip/plzip-1.10.ebuild +++ b/app-arch/plzip/plzip-1.11.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/antoniodiazdiaz.asc inherit toolchain-funcs verify-sig DESCRIPTION="Parallel lzip compressor" @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/$ LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86" RDEPEND="app-arch/lzlib:0=" DEPEND="${RDEPEND}" diff --git a/app-arch/pure-sfv/pure-sfv-0.3-r2.ebuild b/app-arch/pure-sfv/pure-sfv-0.3-r2.ebuild index fec0272766c1..e10b8d93b4f1 100644 --- a/app-arch/pure-sfv/pure-sfv-0.3-r2.ebuild +++ b/app-arch/pure-sfv/pure-sfv-0.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 inherit toolchain-funcs DESCRIPTION="utility to test and create .sfv files and create .par files" -HOMEPAGE="http://pure-sfv.sourceforge.net/" +HOMEPAGE="https://pure-sfv.sourceforge.net/" SRC_URI="mirror://sourceforge/pure-sfv/${PN}_${PV}_src.tar.gz" S="${WORKDIR}" diff --git a/app-arch/qpress/files/qpress-20220819-fix-build-system.patch b/app-arch/qpress/files/qpress-20220819-fix-build-system.patch index 79676f57664d..3fb5750eac9b 100644 --- a/app-arch/qpress/files/qpress-20220819-fix-build-system.patch +++ b/app-arch/qpress/files/qpress-20220819-fix-build-system.patch @@ -11,13 +11,12 @@ diff --git a/makefile b/makefile index 4890f9d..349fbb2 100755 --- a/makefile +++ b/makefile -@@ -1,9 +1,21 @@ +@@ -1,9 +1,20 @@ -PREFIX = /usr/local +DESTDIR ?= +PREFIX ?= /usr/local +CXX ?= g++ -+CXXFLAGS ?= -O3 -+CXXFLAGS += -Wall -Wextra -Werror ++CXXFLAGS ?= -O3 -Wall -Wextra -Werror +LDFLAGS ?= -g++: qpress.cpp aio.cpp quicklz.c utilities.cpp diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest index 061bb8884ca8..aefd06729f16 100644 --- a/app-arch/rar/Manifest +++ b/app-arch/rar/Manifest @@ -1,3 +1,3 @@ -DIST rarlinux-x32-612.tar.gz 616982 BLAKE2B 3ceaf625a77d6bb5543de8c2d118e6a5d679ffcdf295b4476725794277ba01c6b74179daefa2bbe1da7b3c0d29a2d368c1325b099d87955c355cc61461f893ff SHA512 8f67a365145d6fe7c9db1458a67f29a6b878f1969842f0cb43f639af1f8c304b0f4174f83b070f7d821316fdd9dcd2e1788bca2d6af5ef60fdb951924ebc71a4 -DIST rarlinux-x64-612.tar.gz 604520 BLAKE2B ad85a2a5d1b66677707491279166fa42c6f9b2b1e96f9dc8001da5e9199e50762a106991ecb27c0c4eaa72904490eebc43f21236a952da40acf866b1ce40ecd2 SHA512 bccb64b077fa044a920f02a826bafd4a07c446f2ff2ce88b7c8f27d49c6ac48108711880ad43aac89c034f582979cad8b332d675ea483eca9f76bcd892949423 -DIST winrar-x64-611.exe 3479544 BLAKE2B 84f2bf342a92b142731615d13280e36686dbd4f44d8a1c550fa6a03f2267e6ec0f8e963107b3baa5640072b399e58fe8865754b382def2183a391ca204a07333 SHA512 46c001b48be1503e1aa9f7b9540adfa210caa672ee766b3634697e23faa0b8ac140cc392adf13f1b5244ca61572c5dac2085b4a00a492774649602e4fdb6a46d +DIST rarlinux-x32-700.tar.gz 739081 BLAKE2B 3f0d18ba3c9ff6b606bbddd3aafcc70209d87a1aa08877fa8ee62e4c28a56b0dd0d38304d273abb708fa1a9fb1d2264df0dc7eb2ac6dbd1264b250df40f141c5 SHA512 a1f1d1f203ae2f98949346ad331a27ce2d120bf28f289fc42d286fae5c9392af033a4ff72fbe078a130b9267eb42e9739db35aa98ce07f4d97566299aa233934 +DIST rarlinux-x64-700.tar.gz 730268 BLAKE2B 6a3c4890232b6bdc24a6e321bff66c8a41c3c64b7da8dbcd40714de647edabb32f8719be882335895a09453f36e247b7ce96edf8089f8fa6ea08489d69eb7813 SHA512 988b755d1b52051f5d4115a64f598e5d6a6a9d1756e8136a00a159001199bf684c4961245c1010f0414e174f61964e1e3f32f437810708cd77742b9b89946166 +DIST winrar-x64-700.exe 3911632 BLAKE2B f2191937e1e3d0938f0ca2c56467c838415401a20a0966efad050e9fde5fe7fc6e05694c98fd06daa6fe4d7c03f588e60d456d8d510c849929a52dab36d6a10a SHA512 bc94f526d4dd751a44071dd6f540f2957d96f5c6500d7e5bb41ec6581bb0a584a6bb91fe13f7a1d9c7749c4601b1fe95f2a12a204b73bdc9a37c83cff7ac35c3 diff --git a/app-arch/rar/rar-6.12.ebuild b/app-arch/rar/rar-7.00.ebuild index c25f9479a11e..cefa88191bb3 100644 --- a/app-arch/rar/rar-6.12.ebuild +++ b/app-arch/rar/rar-7.00.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 MY_PV="${PV/./}" -MY_PV_WIN64="611" 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_WIN64}.exe" +URI_WIN64="https://www.rarlab.com/rar/winrar-x64-${MY_PV}.exe" inherit unpacker @@ -86,8 +85,8 @@ src_unpack() { elif [[ "${_file}" == winrar* ]]; then ln -s "${DISTDIR}"/${_file} w64.rar || die unpack_rar ./w64.rar - mv Default.SFX default-win32.sfx || die - mv Default64.SFX default-win64.sfx || die + mv Default.SFX default-win64.sfx || die + mv Default32.SFX default-win32.sfx || die else die "Unknown SFX file '${_file}'!" fi diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 36f8cd7a71c0..1598162f1521 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1 +1,2 @@ -DIST rpm-4.18.0.tar.bz2 6600013 BLAKE2B 127c3b1427884d04c3db4fc73eb73a978a58241bc740620e3e46c7557d99833092866b5d9c8b4fdf72cd106668d9e5f5cb8c4b918decf1513a82d10258975116 SHA512 c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec +DIST rpm-4.18.1.tar.bz2 6396363 BLAKE2B 4bc582bdc34a89d83346a8e18133c4f1846f2e8741c85ae2d0fd3398166e5a5d81ed86869e34700d3ea414fbf8ccf6c918692e865b956b1e6b70830b64cd323e SHA512 0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c +DIST rpm-4.19.1.1.tar.bz2 5849649 BLAKE2B 66ed845007f3767fd92e2384962927b93cef7b825b8ea60f81f0a4b51b9d6a09d1cbec1668226fa85de675347d52635cb25c4d11204ada0eed6c898425b21536 SHA512 3364c453c29903c144a3680ceca7a17426eb085c288b6313fb7e857a42a5e0a965f623882e0f58e633f8b8770e839d9df9f7653d99c73759af5c89d0a981908d diff --git a/app-arch/rpm/files/rpm-4.18.1-musl-nls.patch b/app-arch/rpm/files/rpm-4.18.1-musl-nls.patch new file mode 100644 index 000000000000..7d1fde28bacf --- /dev/null +++ b/app-arch/rpm/files/rpm-4.18.1-musl-nls.patch @@ -0,0 +1,42 @@ +https://bugs.gentoo.org/888954 +https://github.com/rpm-software-management/rpm/commit/f401979a4c4829d68e9614860644bdb74b6dda66 + +From da222f0d82721d17e57d491d2749a4bc44754b9d Mon Sep 17 00:00:00 2001 +From: Takuya Wakazono <pastalian46@gmail.com> +Date: Thu, 18 Jan 2024 18:41:11 +0900 +Subject: [PATCH] Don't use _nl_msg_cat_cntr if __GLIC__ is not defined + +musl doesn't need to use libintl from GNU gettext because it has its +own NLS implementation. Assuming _nl_msg_cat_cntr exists breaks the +build against the musl system. +--- a/lib/tagexts.c ++++ b/lib/tagexts.c +@@ -532,7 +532,7 @@ static int filerequireTag(Header h, rpmtd td, headerGetFlags hgflags) + + /* I18N look aside diversions */ + +-#if defined(ENABLE_NLS) ++#if defined(ENABLE_NLS) && (defined(__GLIBC__) || !defined(__linux__)) + extern int _nl_msg_cat_cntr; /* XXX GNU gettext voodoo */ + #endif + static const char * const language = "LANGUAGE"; +@@ -569,7 +569,9 @@ static int i18nTag(Header h, rpmTag tag, rpmtd td, headerGetFlags hgflags) + /* change to en_US for msgkey -> msgid resolution */ + langval = getenv(language); + (void) setenv(language, "en_US", 1); ++#if defined(__GLIBC__) || !defined(__linux__) + ++_nl_msg_cat_cntr; ++#endif + + msgid = NULL; + for (domain = dstring; domain != NULL; domain = de) { +@@ -584,7 +586,9 @@ static int i18nTag(Header h, rpmTag tag, rpmtd td, headerGetFlags hgflags) + (void) setenv(language, langval, 1); + else + unsetenv(language); ++#if defined(__GLIBC__) || !defined(__linux__) + ++_nl_msg_cat_cntr; ++#endif + + if (domain && msgid) { + td->data = dgettext(domain, msgid); diff --git a/app-arch/rpm/files/rpm-4.19.0-libdir.patch b/app-arch/rpm/files/rpm-4.19.0-libdir.patch new file mode 100644 index 000000000000..9899827c985e --- /dev/null +++ b/app-arch/rpm/files/rpm-4.19.0-libdir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c164e9c52..5738c821f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF) + option(WITH_IMAEVM "Build with IMA support" OFF) + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) + +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") ++set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/libexec/rpm" CACHE PATH "rpm home") + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") + + # Emulate libtool versioning. Before a public release: diff --git a/app-arch/rpm/files/rpm-4.19.1.1-musl-compat.patch b/app-arch/rpm/files/rpm-4.19.1.1-musl-compat.patch new file mode 100644 index 000000000000..441689febd5d --- /dev/null +++ b/app-arch/rpm/files/rpm-4.19.1.1-musl-compat.patch @@ -0,0 +1,17 @@ +musl doesn't implement GLOB_BRACE, simply disable it. + +https://bugs.gentoo.org/922286 +https://github.com/rpm-software-management/rpm/issues/2844 +--- a/rpmio/rpmglob.c ++++ b/rpmio/rpmglob.c +@@ -33,6 +33,10 @@ + + #include "debug.h" + ++#ifndef GLOB_BRACE ++#define GLOB_BRACE 0 ++#endif ++ + /* Return 1 if pattern contains a magic char, see glob(7) for a list */ + static int ismagic(const char *pattern) + { diff --git a/app-arch/rpm/files/rpm-4.8.1-clang.patch b/app-arch/rpm/files/rpm-4.8.1-clang.patch new file mode 100644 index 000000000000..714fbc09b534 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.8.1-clang.patch @@ -0,0 +1,52 @@ +https://github.com/rpm-software-management/rpm/commit/6ad8a71407b173b6c50d389f01edd8a4aecd6807 +--- a/lib/fsm.c ++++ b/lib/fsm.c +@@ -1015,27 +1015,28 @@ + } + + setmeta: +- /* Special files require path-based ops */ +- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); +- if (!rc && fd == -1 && mayopen) { +- int flags = O_RDONLY; +- /* Only follow safe symlinks, and never on temporary files */ +- if (fp->suffix) +- flags |= AT_SYMLINK_NOFOLLOW; +- fd = fsmOpenat(di.dirfd, fp->fpath, flags, +- S_ISDIR(fp->sb.st_mode)); +- if (fd < 0) +- rc = RPMERR_OPEN_FAILED; +- } ++ { ++ /* Special files require path-based ops */ ++ int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); ++ if (!rc && fd == -1 && mayopen) { ++ int flags = O_RDONLY; ++ /* Only follow safe symlinks, and never on temporary files */ ++ if (fp->suffix) ++ flags |= AT_SYMLINK_NOFOLLOW; ++ fd = fsmOpenat(di.dirfd, fp->fpath, flags, ++ S_ISDIR(fp->sb.st_mode)); ++ if (fd < 0) ++ rc = RPMERR_OPEN_FAILED; ++ } ++ if (!rc && fp->setmeta) { ++ rc = fsmSetmeta(fd, di.dirfd, fp->fpath, ++ fi, plugins, fp->action, ++ &fp->sb, nofcaps); ++ } + +- if (!rc && fp->setmeta) { +- rc = fsmSetmeta(fd, di.dirfd, fp->fpath, +- fi, plugins, fp->action, +- &fp->sb, nofcaps); +- } +- +- if (fd != firstlinkfile) +- fsmClose(&fd); ++ if (fd != firstlinkfile) ++ fsmClose(&fd); ++ } + } + + /* Notify on success. */ diff --git a/app-arch/rpm/metadata.xml b/app-arch/rpm/metadata.xml index 43a5b10a145b..8e808eda79fe 100644 --- a/app-arch/rpm/metadata.xml +++ b/app-arch/rpm/metadata.xml @@ -1,8 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>pastalian46@gmail.com</email> + <name>Takuya Wakazono</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="github">rpm-software-management/rpm</remote-id> </upstream> + <use> + <flag name="sequoia">Use <pkg>app-crypt/rpm-sequoia</pkg> instead of the deprecated internal parser</flag> + </use> </pkgmetadata> diff --git a/app-arch/rpm/rpm-4.18.0.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild index 9019cd542c75..5054bab122a8 100644 --- a/app-arch/rpm/rpm-4.18.0.ebuild +++ b/app-arch/rpm/rpm-4.18.1.ebuild @@ -1,29 +1,31 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( lua5-{3,4} ) -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit autotools lua-single perl-module python-single-r1 toolchain-funcs DESCRIPTION="Red Hat Package Management Utils" HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm" -SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 - http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" +SRC_URI=" + https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 + http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 +" LICENSE="GPL-2 LGPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" - +IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + python? ( ${PYTHON_REQUIRED_USE} ) +" # Tests are broken. See bug #657500 RESTRICT="test" -IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" -REQUIRED_USE="${LUA_REQUIRED_USE} - python? ( ${PYTHON_REQUIRED_USE} )" - DEPEND=" ${LUA_DEPS} !app-arch/rpm5 @@ -50,7 +52,7 @@ DEPEND=" " BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) nls? ( sys-devel/gettext ) test? ( sys-apps/fakechroot ) " @@ -61,7 +63,9 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-4.8.1-db-path.patch + "${FILESDIR}"/${PN}-4.8.1-clang.patch "${FILESDIR}"/${PN}-4.17.0-libdir.patch + "${FILESDIR}"/${PN}-4.18.1-musl-nls.patch ) pkg_pretend() { @@ -73,7 +77,7 @@ pkg_setup() { use python && python-single-r1_pkg_setup - # Added USE=openmp and this check for bug #779769 + # bug #779769 [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -94,22 +98,25 @@ src_prepare() { src_configure() { # rpm no longer supports berkdb, but has readonly support. # https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0 - econf \ - --enable-libelf \ - --without-selinux \ - --disable-inhibit-plugin \ - --with-crypto=libgcrypt \ - $(use_enable berkdb bdb-ro) \ - $(use_enable python) \ - $(use_enable nls) \ - $(use_enable openmp) \ - $(use_enable dbus inhibit-plugin) \ - $(use_enable sqlite) \ - $(use_with caps cap) \ - $(use_with acl) \ - $(use_with audit) \ - $(use_with readline) \ + local myeconfargs=( + --enable-libelf + --without-selinux + --disable-inhibit-plugin + --with-crypto=libgcrypt + $(use_enable berkdb bdb-ro) + $(use_enable python) + $(use_enable nls) + $(use_enable openmp) + $(use_enable dbus inhibit-plugin) + $(use_enable sqlite) + $(use_with caps cap) + $(use_with acl) + $(use_with audit) + $(use_with readline) $(use_enable zstd zstd $(usex zstd yes no)) + ) + + econf "${myeconfargs[@]}" } src_test() { diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild new file mode 100644 index 000000000000..30fa81d1ff98 --- /dev/null +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -0,0 +1,134 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_MAKEFILE_GENERATOR=emake +LUA_COMPAT=( lua5-{3,4} ) +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake lua-single python-single-r1 toolchain-funcs + +DESCRIPTION="The RPM Package Manager" +HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm" +SRC_URI=" + https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 + http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 +" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +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} + python? ( ${PYTHON_REQUIRED_USE} ) +" +# Tests run against a Fedora container image, which needs to be pulled. +RESTRICT="test" + +DEPEND=" + ${LUA_DEPS} + >=app-arch/bzip2-1.0.1 + app-arch/libarchive:= + app-arch/xz-utils + app-arch/zstd:= + >=app-crypt/gnupg-1.2 + >=dev-lang/perl-5.8.8 + dev-libs/elfutils + >=dev-libs/popt-1.7 + sys-apps/file + sys-libs/readline:= + >=sys-libs/zlib-1.2.3-r1 + acl? ( virtual/acl ) + audit? ( sys-process/audit ) + caps? ( >=sys-libs/libcap-2.0 ) + dbus? ( sys-apps/dbus ) + nls? ( virtual/libintl ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:= ) + sequoia? ( app-crypt/rpm-sequoia ) + !sequoia? ( dev-libs/libgcrypt:= ) + sqlite? ( dev-db/sqlite:3 ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen ) + nls? ( sys-devel/gettext ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-rpm ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.19.0-libdir.patch + "${FILESDIR}"/${P}-musl-compat.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + lua-single_pkg_setup + + use python && python-single-r1_pkg_setup + + # bug #779769 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + # rpm no longer supports berkdb, but has readonly support. + # https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0 + local mycmakeargs=( + -DENABLE_TESTSUITE=OFF + -DWITH_FAPOLICYD=OFF + -DWITH_SELINUX=OFF + -DENABLE_BDB_RO=$(usex berkdb) + -DENABLE_NLS=$(usex nls) + -DENABLE_OPENMP=$(usex openmp) + -DENABLE_PYTHON=$(usex python) + -DENABLE_SQLITE=$(usex sqlite) + -DWITH_ACL=$(usex acl) + -DWITH_AUDIT=$(usex audit) + -DWITH_CAP=$(usex caps) + -DWITH_DBUS=$(usex dbus) + -DWITH_INTERNAL_OPENPGP=$(usex sequoia OFF ON) + -DWITH_READLINE=$(usex readline) + $(cmake_use_find_package doc Doxygen) + ) + cmake_src_configure +} + +src_test() { + emake -C "${BUILD_DIR}" check +} + +src_install() { + cmake_src_install + + # Remove pre-built API docs. + use doc || rm -rf "${ED}/usr/share/doc/${PF}" || die + + dodoc CREDITS README + + keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD} + + use python && python_optimize +} + +pkg_postinst() { + if [[ -f "${EROOT}"/var/lib/rpm/rpmdb.sqlite ]] ; then + einfo "RPM database found... Rebuilding database (may take a while)..." + "${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die + else + einfo "No RPM database found... Creating database..." + "${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die + fi +} diff --git a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild index f6e5c4e88e83..d602205ff2a2 100644 --- a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild +++ b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -12,11 +12,11 @@ SRC_URI="mirror://gentoo/${P}.tar.xz LICENSE="BSD-1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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="" DEPEND="" -RDEPEND="app-arch/cpio" +RDEPEND="app-alternatives/cpio" src_configure() { tc-export CC diff --git a/app-arch/sharutils/metadata.xml b/app-arch/sharutils/metadata.xml index a974c2f2dff9..f9c1b4ac617d 100644 --- a/app-arch/sharutils/metadata.xml +++ b/app-arch/sharutils/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo Base System</name> </maintainer> <upstream> + <remote-id type="savannah">sharutils</remote-id> <remote-id type="cpe">cpe:/a:gnu:sharutils</remote-id> </upstream> </pkgmetadata> diff --git a/app-arch/sharutils/sharutils-4.15.2-r2.ebuild b/app-arch/sharutils/sharutils-4.15.2-r2.ebuild index 43e0c4f8be0e..c9304129d203 100644 --- a/app-arch/sharutils/sharutils-4.15.2-r2.ebuild +++ b/app-arch/sharutils/sharutils-4.15.2-r2.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls" DEPEND="app-arch/xz-utils diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest index 6d2cae5cff27..284181c5cc40 100644 --- a/app-arch/snappy/Manifest +++ b/app-arch/snappy/Manifest @@ -1 +1,2 @@ -DIST snappy-1.1.9.tar.gz 1102382 BLAKE2B 926d03156168e3d4800dc17144db3de2c182c6eb9970d87a00b94fb09b67e403479a64cbed75833b83fd03173c1bb8caaf248a55627e89fe2a34456f12ff3b42 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024 +DIST snappy-1.1.10.tar.gz 1105312 BLAKE2B 5195335fb1883974d290e7dca2b6d928bde2b183f3f61bca9da28855b39fd9a4ee1c24014322d238d2ec94f3a3a55fd43110c88283e85865272226e11cbb4834 SHA512 3578597f1d4ec09104ce0296b825b013590351230dfe56c635081fd282ce7a13a34caf2c283ac77bd24065e2d27af6db068d1f84b98cec2fd39a0e37a0d77070 +DIST snappy-1.2.0.tar.gz 1107265 BLAKE2B 327b60ea032ceb004c5f5e36a0013dc2a44258ec303d0701cf23446904b83e72a66b7e59866a7331c7751a08ce6ec6b871bc056efa6eeb86733d4640569d8072 SHA512 5b3b4e73ff24295885ff9f3d75ccb090e6c7dba40d4965f0892163aa9876296e61590d62023a32d750949268af8ce89df93273b02179d5b3a55de00966a3ae0a diff --git a/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch b/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch deleted file mode 100644 index 04d35f56ee98..000000000000 --- a/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 0c716d435abe65250100c2caea0e5126ac4e14bd Mon Sep 17 00:00:00 2001 -From: "Georgi D. Sotirov" <gdsotirov@gmail.com> -Date: Wed, 5 May 2021 14:16:46 +0300 -Subject: [PATCH] Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE - -Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to -fix the following compilation errors and a warning with GCC: - -[ 2%] Building CXX object CMakeFiles/snappy.dir/snappy.cc.o -/usr/bin/c++ -DHAVE_CONFIG_H -Dsnappy_EXPORTS --I/tmp/snappy-1.1.9/build -I/tmp/snappy-1.1.9 -O3 --march=i586 -mtune=i686 -Wall -Wextra -fno-exceptions -fno-rtti -O3 --DNDEBUG -fPIC -std=c++11 -o CMakeFiles/snappy.dir/snappy.cc.o -c -/tmp/snappy-1.1.9/snappy.cc -/tmp/snappy-1.1.9/snappy.cc:1017:8: warning: always_inline -function might not be inlinable [-Wattributes] - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - ^ -/tmp/snappy-1.1.9/snappy.cc: In function 'std::pair<const -unsigned char*, int> snappy::DecompressBranchless(const uint8_t*, const -uint8_t*, ptrdiff_t, T, ptrdiff_t) [with T = char*; uint8_t = unsigned -char; ptrdiff_t = int]': -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, -size_t*)': function body can be overwritten at link time -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here - size_t tag_type = AdvanceToNextTag(&ip, &tag); - ^ -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, -size_t*)': function body can be overwritten at link time - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - ^ -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here - size_t tag_type = AdvanceToNextTag(&ip, &tag); - ^ -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, -size_t*)': function body can be overwritten at link time - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - ^ -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here - size_t tag_type = AdvanceToNextTag(&ip, &tag); - ^ -CMakeFiles/snappy.dir/build.make:137: recipe for target -'CMakeFiles/snappy.dir/snappy.cc.o' failed - -Just like with other functions using SNAPPY_ATTRIBUTE_ALWAYS_INLINE -macro (i.e. __attribute__((always_inline)) ) it is necessary to use C++ -inline specifier. ---- - snappy.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/snappy.cc b/snappy.cc -index 79dc0e8..51157be 100644 ---- a/snappy.cc -+++ b/snappy.cc -@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* src, size_t size) { - } - - SNAPPY_ATTRIBUTE_ALWAYS_INLINE --size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { -+inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - const uint8_t*& ip = *ip_p; - // This section is crucial for the throughput of the decompression loop. - // The latency of an iteration is fundamentally constrained by the diff --git a/app-arch/snappy/files/snappy-1.2.0_external-gtest.patch b/app-arch/snappy/files/snappy-1.2.0_external-gtest.patch new file mode 100644 index 000000000000..6d929821ba0b --- /dev/null +++ b/app-arch/snappy/files/snappy-1.2.0_external-gtest.patch @@ -0,0 +1,46 @@ +From 4e6c67832f53b126d1e54b9398b88f23e75846f3 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Thu, 11 Apr 2024 10:05:30 +0300 +Subject: [PATCH 1/3] Use external GTest suite + +--- + CMakeLists.txt | 22 ++-------------------- + 1 file changed, 2 insertions(+), 20 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 85afe58..e23d2ca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -319,27 +319,9 @@ endif(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS) + if(SNAPPY_BUILD_TESTS) + enable_testing() + +- # Prevent overriding the parent project's compiler/linker settings on Windows. +- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +- set(install_gtest OFF) +- set(install_gmock OFF) +- set(build_gmock ON) +- + # This project is tested using GoogleTest. +- add_subdirectory("third_party/googletest") +- +- # GoogleTest triggers a missing field initializers warning. +- if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS) +- set_property(TARGET gtest +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- set_property(TARGET gmock +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS) +- +- if(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION) +- set_property(TARGET gtest +- APPEND PROPERTY COMPILE_OPTIONS -Wno-implicit-int-float-conversion) +- endif(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION) ++ find_package(GTest REQUIRED) ++ include(GoogleTest) + + add_executable(snappy_unittest "") + target_sources(snappy_unittest +-- +2.43.2 + diff --git a/app-arch/snappy/files/snappy-1.2.0_no-werror.patch b/app-arch/snappy/files/snappy-1.2.0_no-werror.patch new file mode 100644 index 000000000000..813ff7a59136 --- /dev/null +++ b/app-arch/snappy/files/snappy-1.2.0_no-werror.patch @@ -0,0 +1,24 @@ +From 8a262c4de10c4a7e07db41779fd7ca1565d92631 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Thu, 11 Apr 2024 10:06:47 +0300 +Subject: [PATCH 2/3] Don't use -Werror + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,13 +66,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra") + endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra") + +- # Use -Werror for clang only. +- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") +- endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror") +- endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- + # Disable sign comparison warnings. Matches upcoming Bazel setup. + if(NOT CMAKE_CXX_FLAGS MATCHES "-Wno-sign-compare") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare") +-- +2.43.2 + diff --git a/app-arch/snappy/files/snappy-1.2.0_remove-no-rtti.patch b/app-arch/snappy/files/snappy-1.2.0_remove-no-rtti.patch new file mode 100644 index 000000000000..dcfeae45cfbb --- /dev/null +++ b/app-arch/snappy/files/snappy-1.2.0_remove-no-rtti.patch @@ -0,0 +1,32 @@ +From 012ff3ef652027abd1a422268cf9f164b386f340 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Thu, 11 Apr 2024 10:07:45 +0300 +Subject: [PATCH 3/3] Don't disable RTTI + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,10 +51,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs-c-") + add_definitions(-D_HAS_EXCEPTIONS=0) +- +- # Disable RTTI. +- string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-") + else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + # Use -Wall for clang and gcc. + if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") +@@ -88,10 +84,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + # Disable C++ exceptions. + string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") +- +- # Disable RTTI. +- string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") + endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + + # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make +-- +2.43.2 + diff --git a/app-arch/snappy/metadata.xml b/app-arch/snappy/metadata.xml index 733bf82bf93e..f228393d37be 100644 --- a/app-arch/snappy/metadata.xml +++ b/app-arch/snappy/metadata.xml @@ -14,6 +14,7 @@ other compression library; instead, it aims for very high speeds and reasonable compression.</longdescription> <upstream> + <remote-id type="cpe">cpe:/a:google:snappy</remote-id> <remote-id type="github">google/snappy</remote-id> </upstream> </pkgmetadata> diff --git a/app-arch/snappy/snappy-1.1.9-r1.ebuild b/app-arch/snappy/snappy-1.1.10-r1.ebuild index 6f03591f6f44..83cd13e6ac21 100644 --- a/app-arch/snappy/snappy-1.1.9-r1.ebuild +++ b/app-arch/snappy/snappy-1.1.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,9 +10,11 @@ HOMEPAGE="https://github.com/google/snappy" SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" -SLOT="0/${PV%%.*}" +# ${PV%%.*}.FUDGE where FUDGE is incremented if ABI is broken without a new SONAME +# Please use abidiff on bumps. +SLOT="0/${PV%%.*}.1" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="test" +IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 test" RESTRICT="!test? ( test )" DEPEND="test? ( dev-cpp/gtest )" @@ -20,15 +22,17 @@ DEPEND="test? ( dev-cpp/gtest )" DOCS=( format_description.txt framing_format.txt NEWS README.md ) PATCHES=( - "${FILESDIR}/${P}_gcc_inline.patch" - "${FILESDIR}/${P}_external_gtest.patch" - "${FILESDIR}/${P}-clang-werror.patch" - "${FILESDIR}/${P}_remove-no-rtti.patch" + "${FILESDIR}/${PN}-1.1.9_external_gtest.patch" + "${FILESDIR}/${PN}-1.1.9-clang-werror.patch" + "${FILESDIR}/${PN}-1.1.9_remove-no-rtti.patch" ) multilib_src_configure() { local mycmakeargs=( + -DCMAKE_CXX_STANDARD=14 # Latest gtest needs -std=c++14 or newer -DSNAPPY_BUILD_TESTS=$(usex test) + -DSNAPPY_REQUIRE_AVX=$(usex cpu_flags_x86_avx) + -DSNAPPY_REQUIRE_AVX2=$(usex cpu_flags_x86_avx2) -DSNAPPY_BUILD_BENCHMARKS=OFF # Options below are related to benchmarking, that we disable. -DHAVE_LIBZ=NO diff --git a/app-arch/snappy/snappy-1.2.0-r1.ebuild b/app-arch/snappy/snappy-1.2.0-r1.ebuild new file mode 100644 index 000000000000..a2331f1ef08a --- /dev/null +++ b/app-arch/snappy/snappy-1.2.0-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="A high-speed compression/decompression library by Google" +HOMEPAGE="https://github.com/google/snappy" +SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +# ${PV%%.*}.FUDGE where FUDGE is incremented if ABI is broken without a new SONAME +# Please use abidiff on bumps. +SLOT="0/${PV%%.*}.2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-cpp/gtest )" + +DOCS=( format_description.txt framing_format.txt NEWS README.md ) + +PATCHES=( + "${FILESDIR}/${PN}-1.2.0_external-gtest.patch" + "${FILESDIR}/${PN}-1.2.0_no-werror.patch" + "${FILESDIR}/${PN}-1.2.0_remove-no-rtti.patch" +) + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_CXX_STANDARD=14 # Latest gtest needs -std=c++14 or newer + -DSNAPPY_BUILD_TESTS=$(usex test) + -DSNAPPY_REQUIRE_AVX=$(usex cpu_flags_x86_avx) + -DSNAPPY_REQUIRE_AVX2=$(usex cpu_flags_x86_avx2) + -DSNAPPY_BUILD_BENCHMARKS=OFF + # Options below are related to benchmarking, that we disable. + -DHAVE_LIBZ=NO + -DHAVE_LIBLZO2=NO + -DHAVE_LIBLZ4=NO + ) + cmake_src_configure +} + +multilib_src_test() { + # run tests directly to get verbose output + cd "${S}" || die + "${BUILD_DIR}"/snappy_unittest || die +} diff --git a/app-arch/stenc/Manifest b/app-arch/stenc/Manifest index 15de7048a6b6..f8cbaf0666a3 100644 --- a/app-arch/stenc/Manifest +++ b/app-arch/stenc/Manifest @@ -1 +1,2 @@ DIST stenc-1.1.1.tar.gz 161761 BLAKE2B 865d36befd53e1db00245688e2aac429546b29f7b039cbd04aaafb47fcc55f02ba01e7f13c7814ae4daf102372eded1f069c1b9ecfb2b2e7aaf009bfa2855ae4 SHA512 89eb1da2391be207e23d4e3cc6563405272eeb456b59360e92fbeca063badcfcf4c37fc814af59803707006e5c04e43e18755e1d30b0f3b3020a7645396db1a6 +DIST stenc-2.0.0.tar.gz 166547 BLAKE2B d5a5b8794887f7ba1353b573d4aad41abd719067ab7256f0f90101a960847707ce47d63618d7b406726841114e8495aba2a0c5053c3e11f9c118859ab8573a89 SHA512 9dcdcff547d8f0d1fd99eaaf54812e47ca5a3f4e56befe11d7e32919bc7caa968476f0f082925c86be1e9892369cec26125be089bf11f29c87ca63b3614ebffe diff --git a/app-arch/stenc/stenc-2.0.0.ebuild b/app-arch/stenc/stenc-2.0.0.ebuild new file mode 100644 index 000000000000..b90597d8f9e6 --- /dev/null +++ b/app-arch/stenc/stenc-2.0.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/scsitape/stenc.git" + S="${WORKDIR}/${P}/src" +else + SRC_URI="https://github.com/scsitape/stenc/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="SCSI Tape Encryption Manager enables AES support for LTO drives" +HOMEPAGE="https://github.com/scsitape/stenc/" + +LICENSE="GPL-2" +SLOT="0" + +BDEPEND=" + virtual/pandoc + virtual/pkgconfig +" + +src_prepare() { + default + eautoreconf +} diff --git a/app-arch/stormlib/Manifest b/app-arch/stormlib/Manifest index de6109e6e67b..4081bddc12d0 100644 --- a/app-arch/stormlib/Manifest +++ b/app-arch/stormlib/Manifest @@ -1 +1,2 @@ DIST StormLib-9.24.tar.gz 625374 BLAKE2B 3647580b1b048e284ade2fb23aed53cac76a89a0180908f48fc99d571e702d876de37e42a47b3d351c72e6fa905fc02f4b8fa691a6840013637e1560e9acafcb SHA512 38694685edfc9c53ff1e303109831b6a791200b9db275043bca8b3bbe7cc928cf0ce9cf554c6758f693da453b85e6385d277ae9add7af867c13488d77432cde5 +DIST StormLib-9.25.tar.gz 603875 BLAKE2B c7da242d039f5a49e8abd295b42e639fc540c77ee4bf8f210610d56940d1d35f19ea267dccde89e50f744218527f4c521e1d320f24e8fe3a0e0739ee899aa023 SHA512 0da78bda4bb89637da892fc73a0673b8a5f852ede4fdceba1029431d24dd1e59db9bfceafab1c5fb642e4b5d0d15d9865f7a138bfb190ce0c2d3601b22dd3023 diff --git a/app-arch/stormlib/stormlib-9.25.ebuild b/app-arch/stormlib/stormlib-9.25.ebuild new file mode 100644 index 000000000000..dbb04664be09 --- /dev/null +++ b/app-arch/stormlib/stormlib-9.25.ebuild @@ -0,0 +1,44 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +MY_P=StormLib-${PV} +DESCRIPTION="Library to read and write MPQ archives (Diablo, StarCraft)" +HOMEPAGE=" + http://www.zezula.net/en/mpq/stormlib.html + https://github.com/ladislav-zezula/StormLib/ +" +SRC_URI=" + https://github.com/ladislav-zezula/StormLib/archive/v${PV}.tar.gz + -> ${MY_P}.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + app-arch/bzip2:= + dev-libs/libtomcrypt:=[libtommath] + sys-libs/zlib:= +" +DEPEND=${RDEPEND} + +PATCHES=( + "${FILESDIR}"/stormlib-9.24-gnuinstalldirs.patch +) + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + # interactive test app + -DSTORM_BUILD_TESTS=OFF + -DWITH_LIBTOMCRYPT=ON + ) + + cmake_src_configure +} diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest index 1a295ed77eed..52fa6aa731e6 100644 --- a/app-arch/tar/Manifest +++ b/app-arch/tar/Manifest @@ -1,2 +1,4 @@ DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902 DIST tar-1.34.tar.xz.sig 181 BLAKE2B 2fae91293a9dacda0374706e1f83498042a9d5224f80f6f0e14abdb914cb5a8e980f720eb4a453485844c7fe26e0525f230c0eab11c7fa89159a1a929370795c SHA512 55297f41549deee511f5b14c6b5dc7bb3d9282dad52bcc85f9dddfad24b677f989ba86387ad9b133c3698feedbd6b6cd7e9f005e8e4c89f72c80543eeceb78f7 +DIST tar-1.35.tar.xz 2317208 BLAKE2B e1a200d21f433cd7d917dd979db16919a9167056ae62cf7d038a6118e56b2fe419cd4a396eee66f1f4dc13a8dc380e23f6ffd7ee0ca84e5dd9ad9411f60e002c SHA512 8b84ed661e6c878fa33eb5c1808d20351e6f40551ac63f96014fb0d0b9c72d5d94d8865d39e36bcb184fd250f84778a3b271bbd8bd2ceb69eece0c3568577510 +DIST tar-1.35.tar.xz.sig 95 BLAKE2B 8501b55b700bc99b81f04519db1cd8f7bc3d87dd5bfefa25a3d979b23359f02dfb770f3dd66dca275baa70a99612cb85c1019faaf3a1f0bcf50c9815b8e32eca SHA512 00e5c95bf8015f75f59556a82ed7f50bddefe89754c7ff3c19411aee2f37626a5d65c33e18b87f7f8f96388d3f175fd095917419a3ad1c0fc9d6188088bac944 diff --git a/app-arch/tar/files/tar-1.34-fix-cve-2022-48303.patch b/app-arch/tar/files/tar-1.34-fix-cve-2022-48303.patch new file mode 100644 index 000000000000..7ef604b52378 --- /dev/null +++ b/app-arch/tar/files/tar-1.34-fix-cve-2022-48303.patch @@ -0,0 +1,32 @@ +Gentoo Bug: https://bugs.gentoo.org/898176 +Upstream Commit Link: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=3da78400eafcccb97e2f2fd4b227ea40d794ede8 + +From 3da78400eafcccb97e2f2fd4b227ea40d794ede8 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray@gnu.org> +Date: Sat, 11 Feb 2023 11:57:39 +0200 +Subject: [PATCH] Fix boundary checking in base-256 decoder + +* src/list.c (from_header): Base-256 encoding is at least 2 bytes +long. +--- + src/list.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/list.c b/src/list.c +index 9fafc425..86bcfdd1 100644 +--- a/src/list.c ++++ b/src/list.c +@@ -881,8 +881,9 @@ from_header (char const *where0, size_t digs, char const *type, + where++; + } + } +- else if (*where == '\200' /* positive base-256 */ +- || *where == '\377' /* negative base-256 */) ++ else if (where <= lim - 2 ++ && (*where == '\200' /* positive base-256 */ ++ || *where == '\377' /* negative base-256 */)) + { + /* Parse base-256 output. A nonnegative number N is + represented as (256**DIGS)/2 + N; a negative number -N is +-- +2.39.2.637.g21b0678d19-goog diff --git a/app-arch/tar/tar-1.34-r2.ebuild b/app-arch/tar/tar-1.34-r3.ebuild index 9db23837e033..cc5253e340f7 100644 --- a/app-arch/tar/tar-1.34-r2.ebuild +++ b/app-arch/tar/tar-1.34-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/tar.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tar.asc inherit verify-sig DESCRIPTION="Use this to make tarballs :)" @@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? ( LICENSE="GPL-3+" SLOT="0" if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 IUSE="acl minimal nls selinux xattr" @@ -37,9 +37,18 @@ PDEPEND=" app-alternatives/tar " +PATCHES=( + "${FILESDIR}"/${P}-fix-cve-2022-48303.patch +) + src_configure() { + # -fanalyzer doesn't make sense for us in ebuilds, as it's for static analysis + export gl_cv_warn_c__fanalyzer=no + local myeconfargs=( --bindir="${EPREFIX}"/bin + # Avoid -Werror + --disable-gcc-warnings --enable-backup-scripts --libexecdir="${EPREFIX}"/usr/sbin $(use_with acl posix-acls) @@ -85,6 +94,13 @@ pkg_postinst() { # ensure to preserve the symlink before app-alternatives/tar # is installed if [[ ! -h ${EROOT}/bin/tar ]]; then + if [[ -e ${EROOT}/usr/bin/tar ]] ; then + # bug #904887 + ewarn "${EROOT}/usr/bin/tar exists but is not a symlink." + ewarn "This is expected during Prefix bootstrap and unusual otherwise." + ewarn "Moving away unexpected ${EROOT}/usr/bin/tar to .bak." + mv "${EROOT}/usr/bin/tar" "${EROOT}/usr/bin/tar.bak" || die + fi ln -s gtar "${EROOT}/bin/tar" || die fi } diff --git a/app-arch/tar/tar-1.35.ebuild b/app-arch/tar/tar-1.35.ebuild new file mode 100644 index 000000000000..46d2ebf890bb --- /dev/null +++ b/app-arch/tar/tar-1.35.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tar.asc +inherit multiprocessing verify-sig + +DESCRIPTION="Use this to make tarballs :)" +HOMEPAGE="https://www.gnu.org/software/tar/" +SRC_URI=" + mirror://gnu/tar/${P}.tar.xz + https://alpha.gnu.org/gnu/tar/${P}.tar.xz + verify-sig? ( + mirror://gnu/tar/${P}.tar.xz.sig + https://alpha.gnu.org/gnu/tar/${P}.tar.xz.sig + ) +" + +LICENSE="GPL-3+" +SLOT="0" +if [[ -z "$(ver_cut 3)" || "$(ver_cut 3)" -lt 90 ]] ; 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 +IUSE="acl minimal nls selinux xattr" + +RDEPEND=" + acl? ( virtual/acl ) + selinux? ( sys-libs/libselinux ) +" +DEPEND=" + ${RDEPEND} + xattr? ( elibc_glibc? ( sys-apps/attr ) ) +" +BDEPEND=" + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-tar ) +" +PDEPEND=" + app-alternatives/tar +" + +src_configure() { + # -fanalyzer doesn't make sense for us in ebuilds, as it's for static analysis + export gl_cv_warn_c__fanalyzer=no + + local myeconfargs=( + --bindir="${EPREFIX}"/bin + # Avoid -Werror + --disable-gcc-warnings + --enable-backup-scripts + --libexecdir="${EPREFIX}"/usr/sbin + $(use_with acl posix-acls) + $(use_enable nls) + $(use_with selinux) + $(use_with xattr xattrs) + + # autoconf looks for gtar before tar (in configure scripts), hence + # in Prefix it is important that it is there, otherwise, a gtar from + # the host system (FreeBSD, Solaris, Darwin) will be found instead + # of the Prefix provided (GNU) tar + --program-prefix=g + ) + + # Drop CONFIG_SHELL hack after 1.35: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=7687bf4acc4dc4554538389383d7fb4c3e6521cd + CONFIG_SHELL="${BROOT}"/bin/bash FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}" +} + +src_test() { + # Drop after 1.35: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=18f90676e4695ffcf13413e9fbb24cc0ae2ae9d5 + local -x XZ_OPT= XZ_DEFAULTS= + + emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" +} + +src_install() { + default + + # A nasty yet required piece of baggage + exeinto /etc + doexe "${FILESDIR}"/rmt + + mv "${ED}"/usr/sbin/{gbackup,backup-tar} || die + mv "${ED}"/usr/sbin/{grestore,restore-tar} || die + mv "${ED}"/usr/sbin/{g,}backup.sh || die + mv "${ED}"/usr/sbin/{g,}dump-remind || die + + if use minimal ; then + find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \ + -type f -a '!' -name gtar \ + -delete || die + fi + + if ! use minimal; then + dosym grmt /usr/sbin/rmt + fi + dosym grmt.8 /usr/share/man/man8/rmt.8 +} + +pkg_postinst() { + # Ensure to preserve the symlink before app-alternatives/tar + # is installed + if [[ ! -h ${EROOT}/bin/tar ]]; then + if [[ -e ${EROOT}/usr/bin/tar ]] ; then + # bug #904887 + ewarn "${EROOT}/usr/bin/tar exists but is not a symlink." + ewarn "This is expected during Prefix bootstrap and unusual otherwise." + ewarn "Moving away unexpected ${EROOT}/usr/bin/tar to .bak." + mv "${EROOT}/usr/bin/tar" "${EROOT}/usr/bin/tar.bak" || die + fi + ln -s gtar "${EROOT}/bin/tar" || die + fi +} diff --git a/app-arch/tardelta/tardelta-1.0.1.ebuild b/app-arch/tardelta/tardelta-1.0.1-r1.ebuild index 3698c416122e..37dfd6b81b3e 100644 --- a/app-arch/tardelta/tardelta-1.0.1.ebuild +++ b/app-arch/tardelta/tardelta-1.0.1-r1.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 DESCRIPTION="Generate a tarball of differences between two tarballs" diff --git a/app-arch/tarlz/Manifest b/app-arch/tarlz/Manifest index 6b51ec354718..772095f9e4fc 100644 --- a/app-arch/tarlz/Manifest +++ b/app-arch/tarlz/Manifest @@ -1 +1 @@ -DIST tarlz-0.23.tar.lz 112276 BLAKE2B 87153b1e843ed74b5efd339d29e79ddef2bbd11ff951898383ae4c6c099f4e97ef58b8bd2f14ff5bff2cfd6baccb433ab55b9b9b78d0893caef5bd1f4d07a36e SHA512 623407142d03e0ddae3dbb057b8ef5f1aea850418dbb47c6278affa42c88bc1786cd3249d1e8c018643f41516787225cb2ed3aca2fc02ba8e65dfe4744f965d8 +DIST tarlz-0.25.tar.lz 113783 BLAKE2B 56aad4c839ec4fe10bcd7101cea3300aae8e73630ac95de529401d308b23f8fb292d02a7817484259985fc079380e50219ea8d5002427f2bffad63137a1f03b1 SHA512 a55e89c3e701375d47f6fefd3cba5621f53371f3b3e59c174759e5d122f852b6eec02f5e71ce375b84d6af253841ad4b0d4c8a8af8fc12b81f877f0ab8c3b3c8 diff --git a/app-arch/tarlz/tarlz-0.23.ebuild b/app-arch/tarlz/tarlz-0.25.ebuild index 173f51872685..6e55bf850642 100644 --- a/app-arch/tarlz/tarlz-0.23.ebuild +++ b/app-arch/tarlz/tarlz-0.25.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest index e33a18a286e3..08aa339c1310 100644 --- a/app-arch/torrentzip/Manifest +++ b/app-arch/torrentzip/Manifest @@ -1 +1,3 @@ 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-1.2-checksum-detection.patch b/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch new file mode 100644 index 000000000000..ac1ae14cbe03 --- /dev/null +++ b/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch @@ -0,0 +1,51 @@ +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/metadata.xml b/app-arch/torrentzip/metadata.xml index a2a3c19e67ce..7f1fee17f0f1 100644 --- a/app-arch/torrentzip/metadata.xml +++ b/app-arch/torrentzip/metadata.xml @@ -11,12 +11,15 @@ </maintainer> <longdescription> - TorrentZip is a replacement for MameZip. The goal of the program is to - use standard values when creating zips to create identical files over - multiple systems. It has the ability to create a torrentzip format - from a zip file. + Torrentzip converts zip archives to a standard format with some + pre-defined values, sorting the files, and using particular + compression settings so that running it on zip archives created + by other tools will always result in the same output. This helps + e.g. with sharing zip archives using BitTorrent (which is where + the name comes from). </longdescription> <upstream> + <remote-id type="github">0-wiz-0/trrntzip</remote-id> <remote-id type="sourceforge">trrntzip</remote-id> </upstream> </pkgmetadata> diff --git a/app-arch/torrentzip/torrentzip-1.2-r1.ebuild b/app-arch/torrentzip/torrentzip-1.2-r1.ebuild new file mode 100644 index 000000000000..d526e0b88c10 --- /dev/null +++ b/app-arch/torrentzip/torrentzip-1.2-r1.ebuild @@ -0,0 +1,28 @@ +# 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/torrentzip/torrentzip-1.3.ebuild b/app-arch/torrentzip/torrentzip-1.3.ebuild new file mode 100644 index 000000000000..7a3ce63d28a3 --- /dev/null +++ b/app-arch/torrentzip/torrentzip-1.3.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake python-any-r1 + +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" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + sys-libs/zlib:= +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + test? ( + ${RDEPEND} + ${PYTHON_DEPS} + >=dev-util/nihtest-1.5.0 + ) +" + +DOCS=(AUTHORS NEWS.md README.md) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + if use test; then + local mycmakeargs=( -DPYTHONBIN="${EPYTHON}" ) + else + local mycmakeargs=( -DRUN_REGRESS=NO ) + fi + cmake_src_configure +} diff --git a/app-arch/unace/unace-2.5-r6.ebuild b/app-arch/unace/unace-2.5-r6.ebuild index f8dbaf5919a5..48bed159fdc8 100644 --- a/app-arch/unace/unace-2.5-r6.ebuild +++ b/app-arch/unace/unace-2.5-r6.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="freedist" SLOT="1" -KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris" +KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux" PATCHES=( "${WORKDIR}"/debian/patches/ diff --git a/app-arch/unadf/unadf-0.7.12-r2.ebuild b/app-arch/unadf/unadf-0.7.12-r2.ebuild index 2c73f6a4a614..5e358f5bf7e8 100644 --- a/app-arch/unadf/unadf-0.7.12-r2.ebuild +++ b/app-arch/unadf/unadf-0.7.12-r2.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos" PATCHES=( "${FILESDIR}"/${PN}-0.7.12-CVE-2016-1243_CVE-2016-1244.patch ) diff --git a/app-arch/unar/Manifest b/app-arch/unar/Manifest index 270ff06cac04..1bac5fca46f0 100644 --- a/app-arch/unar/Manifest +++ b/app-arch/unar/Manifest @@ -1,2 +1,2 @@ -DIST XADMaster-1.10.7.tar.gz 2064770 BLAKE2B f6119dfb46f3d617fafb5847f41d6c0f3e5e87c8cd0763cd8e5986fae1d5b1c6e6761e9e7e4fa84125003979151b2b34d35ff47dc9be3271107cf53f1be22644 SHA512 3447b6d8f3f4fa5eea93c6628a1633017da6ff09c580d5ce4fd422027b3b79acbf38d6e41a059806d1e60eb25a9d66889938b32599168dc2c0ca648e1c1976b1 +DIST XADMaster-1.10.8.tar.gz 2072715 BLAKE2B ffa674a007865a7bbe3b67a97ad41ac4c4d4fcaf90a39d410a1f7668ac5dd526d0af7b523aca951a3dcc8ee61eb1b7f17db88604464504b2273471f3c31f846a SHA512 34c6c47806877763e022720ac3f6097c9c369481f2bb4a1c1c22e65e2c6250835c73bc3f73e71764810acec8950b05ae9f2dc29348ff192ef22968776fc7efe4 DIST universal-detector-1.1.tar.gz 196274 BLAKE2B d84dc1f850031213d88c288341edcbb588197f23ae0d10632ed129e73e4cc2b7670c8c862bba2165fcc7421c265e4dc3e791ea188e3d2b647bd1ab9b428bb866 SHA512 e514670b3d37b2472ed3e9cb0fdc3298a8479772264b7573411f104be554222bec2e01f73e1f35db95620fe785bee2dcf9ddc9c2b1f4ff6b522fa64d14d020f5 diff --git a/app-arch/unar/files/unar-1.10.8-Wint-conversion.patch b/app-arch/unar/files/unar-1.10.8-Wint-conversion.patch new file mode 100644 index 000000000000..73053c97b86a --- /dev/null +++ b/app-arch/unar/files/unar-1.10.8-Wint-conversion.patch @@ -0,0 +1,40 @@ +Without this change, GCC 14 will fail compilation with an error: + +XADRAR5Parser.m: In function ‘+[XADRAR5Parser recognizeFileWithHandle:firstBytes:name:]’: XADRAR5Parser.m:79:5: warning: ‘XADRAR5Parser’ may not respond to ‘+signatureLocationInData:’ + 79 | off_t signatureLocation = [self signatureLocationInData:data]; + | ^~~~~ +XADRAR5Parser.m:79:5: warning: (messages without a matching method signature will be assumed to return ‘id’ and accept ‘...’ as arguments) +XADRAR5Parser.m:79:31: error: initialization of ‘off_t’ {aka ‘long int’} from ‘id’ makes integer from pointer without a cast + 79 | off_t signatureLocation = [self signatureLocationInData:data]; + | ^ + +Submitted upstream: <https://github.com/MacPaw/XADMaster/pull/161> + +--- a/XADRAR5Parser.m ++++ b/XADRAR5Parser.m +@@ -74,12 +74,6 @@ static inline BOOL IsZeroHeaderBlock(RAR5HeaderBlock block) { return IsZeroBlock + return 8; + } + +-+(BOOL)recognizeFileWithHandle:(CSHandle *)handle firstBytes:(NSData *)data name:(NSString *)name +-{ +- off_t signatureLocation = [self signatureLocationInData:data]; +- return signatureLocation != RAR5SignatureNotFound; +-} +- + + (off_t)signatureLocationInData:(NSData *)data { + const uint8_t *bytes=[data bytes]; + int length=[data length]; +@@ -98,6 +92,12 @@ static inline BOOL IsZeroHeaderBlock(RAR5HeaderBlock block) { return IsZeroBlock + return RAR5SignatureNotFound; + } + +++(BOOL)recognizeFileWithHandle:(CSHandle *)handle firstBytes:(NSData *)data name:(NSString *)name ++{ ++ off_t signatureLocation = [self signatureLocationInData:data]; ++ return signatureLocation != RAR5SignatureNotFound; ++} ++ + +(NSArray *)volumesForHandle:(CSHandle *)handle firstBytes:(NSData *)data name:(NSString *)name + { + // Check if multipart diff --git a/app-arch/unar/metadata.xml b/app-arch/unar/metadata.xml index 31bc544aa598..6331a43e5661 100644 --- a/app-arch/unar/metadata.xml +++ b/app-arch/unar/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>soap@gentoo.org</email> - <name>David Seifert</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">MacPaw/XADMaster</remote-id> </upstream> diff --git a/app-arch/unar/unar-1.10.7.ebuild b/app-arch/unar/unar-1.10.8.ebuild index 8e9518d4b8e6..77668d74dd51 100644 --- a/app-arch/unar/unar-1.10.7.ebuild +++ b/app-arch/unar/unar-1.10.8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit bash-completion-r1 toolchain-funcs @@ -9,29 +9,49 @@ DESCRIPTION="Unpacker for various archiving formats, e.g. rar v3" HOMEPAGE="https://unarchiver.c3.cx/" SRC_URI=" https://github.com/MacPaw/XADMaster/archive/v${PV}/XADMaster-${PV}.tar.gz - https://github.com/MacPaw/universal-detector/archive/1.1/universal-detector-1.1.tar.gz -" + https://github.com/MacPaw/universal-detector/archive/1.1/universal-detector-1.1.tar.gz" +S="${WORKDIR}/XADMaster-${PV}" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64" -BDEPEND=" - sys-devel/gcc[objc] -" RDEPEND=" app-arch/bzip2:= dev-libs/icu:= gnustep-base/gnustep-base:= media-sound/wavpack - sys-libs/zlib -" -DEPEND="${RDEPEND} - ${BDEPEND} - gnustep-base/gnustep-make[native-exceptions] -" + sys-libs/zlib" +DEPEND=" + ${RDEPEND} + gnustep-base/gnustep-make[native-exceptions]" +BDEPEND=" + || ( + sys-devel/gcc[objc] + gnustep-base/gnustep-make[libobjc2] + )" -S="${WORKDIR}/XADMaster-${PV}" +PATCHES=( "${FILESDIR}"/${P}-Wint-conversion.patch ) + +check_objc_toolchain() { + if tc-is-gcc; then + 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]' && + 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 +} src_prepare() { default diff --git a/app-arch/unp/Manifest b/app-arch/unp/Manifest index 53acee291dda..1388f986cc78 100644 --- a/app-arch/unp/Manifest +++ b/app-arch/unp/Manifest @@ -1 +1,3 @@ +DIST unp_2.0.tar.xz 19252 BLAKE2B d807cdae6cccd846b3d138b7060b17f37f6f6962e2dd75400e86f0fd8f7f4721afbf29509dfce16beb5dac66996df45cc146d72312f859999f33d435f66890d5 SHA512 bdb2059aa3f1872efd49eb6c8e2fa3a09c05d9e1c26abdcfc4e728699c25a132ea610525461e94183263086756e9b60daeb5cecf69533578d01ab1a37b0af744 +DIST unp_2.0~pre10.tar.xz 17992 BLAKE2B 63d8c995091a1342677b6aed5854293c582cb6d42c6748ef3d92347ca75e1d3e9e5b128309299ec0b6fc0361bc14dededcc8e290fe8721aecfe82665e07998e9 SHA512 3f8f9f20eef88658b4b00efd37208d859fb3220178f9446696f755a864fea3c3dd301100668bd9c97ca9312ebe961aaf9ec523d8817b8aacb5a1ee6a36213666 DIST unp_2.0~pre9.tar.xz 16424 BLAKE2B 9042f48be0f80d5e40a08161a35c282ba458dc98cf13992835bdeecebd5fbadd33b3af9165738332cb9f508550a234a48d314332f00ecdacc808a8051eb0740b SHA512 74c9a6e143c9023bdd456dacff5c3a6e30722e259f324c066fe3eed9e4a09c38b399b381719c8677c2fa84434c1e7720384d782d97c098fa6fbcbdbf4030986e diff --git a/app-arch/unp/metadata.xml b/app-arch/unp/metadata.xml index dcdae049d7cf..4da67a4f4b42 100644 --- a/app-arch/unp/metadata.xml +++ b/app-arch/unp/metadata.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"><email>hanno@gentoo.org</email></maintainer> + <maintainer type="person"> + <email>hanno@gentoo.org</email> + </maintainer> </pkgmetadata> diff --git a/app-arch/unp/unp-2.0.ebuild b/app-arch/unp/unp-2.0.ebuild new file mode 100644 index 000000000000..37398ba03966 --- /dev/null +++ b/app-arch/unp/unp-2.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 strip-linguas + +DESCRIPTION="Script for unpacking various file formats" +HOMEPAGE="https://packages.qa.debian.org/u/unp.html" +SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${PV}.tar.xz" +S="${WORKDIR}/${P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="nls test" + +DEPEND="nls? ( sys-devel/gettext ) + test? ( app-arch/lzop + app-arch/lzip + app-arch/zstd )" + +RDEPEND="${DEPEND} + dev-lang/perl" + +RESTRICT="!test? ( test )" + +src_compile() { + if use nls; then + strip-linguas -i . + if [ -n "$LINGUAS" ]; then + emake -C po MOFILES="${LINGUAS// /.po }.po" + else + emake -C po + fi + fi +} + +src_install() { + dobin unp + dosym unp /usr/bin/ucat + doman debian/unp.1 + dodoc debian/changelog debian/README.Debian + newbashcomp debian/unp.bash-completion unp + + if use nls; then + if [ -n "$LINGUAS" ]; then + emake -C po MOFILES="${LINGUAS// /.mo }.mo" DESTDIR="${D}" install + else + emake -C po DESTDIR="${D}" install + fi + fi +} diff --git a/app-arch/unp/unp-2.0_pre10.ebuild b/app-arch/unp/unp-2.0_pre10.ebuild new file mode 100644 index 000000000000..c719be032835 --- /dev/null +++ b/app-arch/unp/unp-2.0_pre10.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 strip-linguas + +DESCRIPTION="Script for unpacking various file formats" +HOMEPAGE="https://packages.qa.debian.org/u/unp.html" +MY_PV="${PV/_pre/$'\x7e'pre}" +SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${MY_PV}.tar.xz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="nls" + +DEPEND="nls? ( sys-devel/gettext )" + +RDEPEND="${DEPEND} + dev-lang/perl" + +# tests in upstream tarball are missing sample files +RESTRICT="test" + +src_compile() { + if use nls; then + strip-linguas -i . + if [ -n "$LINGUAS" ]; then + emake -C po MOFILES="${LINGUAS// /.po }.po" + else + emake -C po + fi + fi +} + +src_install() { + dobin unp + dosym unp /usr/bin/ucat + doman debian/unp.1 + dodoc debian/changelog debian/README.Debian + newbashcomp debian/unp.bash-completion unp + + if use nls; then + if [ -n "$LINGUAS" ]; then + emake -C po MOFILES="${LINGUAS// /.mo }.mo" DESTDIR="${D}" install + else + emake -C po DESTDIR="${D}" install + fi + fi +} diff --git a/app-arch/unp/unp-2.0_pre9.ebuild b/app-arch/unp/unp-2.0_pre9.ebuild index 5656064e6772..f1c6e585a03f 100644 --- a/app-arch/unp/unp-2.0_pre9.ebuild +++ b/app-arch/unp/unp-2.0_pre9.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="nls" DEPEND="nls? ( sys-devel/gettext )" diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest index a31a0a31ebde..460f0cf5c907 100644 --- a/app-arch/unrar/Manifest +++ b/app-arch/unrar/Manifest @@ -1,3 +1,5 @@ -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.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.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/unrar-6.2.1.ebuild b/app-arch/unrar/unrar-6.2.10.ebuild index e8164c63ca90..64caffbf3b3a 100644 --- a/app-arch/unrar/unrar-6.2.1.ebuild +++ b/app-arch/unrar/unrar-6.2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,12 +14,9 @@ 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" +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 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-6.2.3.ebuild b/app-arch/unrar/unrar-6.2.12.ebuild index e38b27b24a93..c97982261acd 100644 --- a/app-arch/unrar/unrar-6.2.3.ebuild +++ b/app-arch/unrar/unrar-6.2.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,12 +14,9 @@ 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" +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 diff --git a/app-arch/unrar/unrar-6.1.7.ebuild b/app-arch/unrar/unrar-6.2.8.ebuild index 56d997e2693c..64caffbf3b3a 100644 --- a/app-arch/unrar/unrar-6.1.7.ebuild +++ b/app-arch/unrar/unrar-6.2.8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit multilib toolchain-funcs @@ -14,12 +14,9 @@ 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" +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 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 +} diff --git a/app-arch/unrpa/metadata.xml b/app-arch/unrpa/metadata.xml index a7c2fe241d86..6f03c8b2ed2b 100644 --- a/app-arch/unrpa/metadata.xml +++ b/app-arch/unrpa/metadata.xml @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> + <maintainer type="person" proxied="yes"> + <email>contact@hacktivis.me</email> + <name>Haelwenn (lanodan) Monnier</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <longdescription> Unrpa is a script to extract files from archives created for diff --git a/app-arch/unrpa/unrpa-2.3.0.ebuild b/app-arch/unrpa/unrpa-2.3.0-r1.ebuild index 9310e3e2a7f9..4e143eed4708 100644 --- a/app-arch/unrpa/unrpa-2.3.0.ebuild +++ b/app-arch/unrpa/unrpa-2.3.0-r1.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 DESCRIPTION="Ren'Py's RPA data file extractor" HOMEPAGE="https://github.com/Lattyware/unrpa" SRC_URI="https://github.com/Lattyware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -SLOT="0" LICENSE="GPL-3" +SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/app-arch/unshield/Manifest b/app-arch/unshield/Manifest index e577bd24fc38..a91788422420 100644 --- a/app-arch/unshield/Manifest +++ b/app-arch/unshield/Manifest @@ -1 +1 @@ -DIST unshield-1.4.3.tar.gz 58822 BLAKE2B 89e23462610d7ffd25358cb1d9f234b5c80a580deb60e85610ddacc8e3aa92420cb0e885e80375089e93786565824813f23c54f7c4d60b7773f23d174c98e5d7 SHA512 2f058e0a28d0497e2afe231ded1b1bb16745401398eb1035e628d263351b10a1343c9664f3937b8912755db9dc5236a1b43e9bcba596affb7aa8b036f49382aa +DIST unshield-1.5.1.tar.gz 67454 BLAKE2B 7def714e8d74312de8b822b0add92a803fadda0394252587219c7379791ec33680bf9430c6811e71354fd2e9ccc91e28697e31a2377ecc16aa43edea1ce30e57 SHA512 acb130c461bed66dc3804394be067a68aea96a7cd20b348e713f64a11bf642b74f68fc172f220a9790b44573abbe01ed4585191158f27c40e863918a7342c1ca diff --git a/app-arch/unshield/files/unshield-1.4.3-mandir.patch b/app-arch/unshield/files/unshield-1.4.3-mandir.patch deleted file mode 100644 index 49f634fa8631..000000000000 --- a/app-arch/unshield/files/unshield-1.4.3-mandir.patch +++ /dev/null @@ -1,21 +0,0 @@ -From cf53f87fae324e1a4c5d9ebd49b88947a9b02267 Mon Sep 17 00:00:00 2001 -From: Dan Church <amphetamachine@gmail.com> -Date: Fri, 2 Nov 2018 11:00:20 -0500 -Subject: [PATCH] Fix man page install path - -Use the standard CMake variable to determine location. ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e0c20d3..0aeecb5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -87,5 +87,5 @@ endif () - add_subdirectory(lib) - add_subdirectory(src) - --install(FILES man/unshield.1 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man1) -+install(FILES man/unshield.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libunshield.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/app-arch/unshield/unshield-1.4.3.ebuild b/app-arch/unshield/unshield-1.5.1.ebuild index 2980dff623fa..a016bb33cdc4 100644 --- a/app-arch/unshield/unshield-1.4.3.ebuild +++ b/app-arch/unshield/unshield-1.5.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -24,5 +24,3 @@ DEPEND=" dev-libs/openssl:0= sys-libs/zlib" RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-mandir.patch" ) diff --git a/app-arch/unzip/unzip-6.0_p27-r1.ebuild b/app-arch/unzip/unzip-6.0_p27-r1.ebuild index 126a4a35e234..c2354e7edc67 100644 --- a/app-arch/unzip/unzip-6.0_p27-r1.ebuild +++ b/app-arch/unzip/unzip-6.0_p27-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 ) @@ -64,13 +64,9 @@ src_configure() { case ${CHOST} in i?86*-*linux*) TARGET="linux_asm" ;; *linux*) TARGET="linux_noasm" ;; - i?86*-*bsd* | \ - i?86*-dragonfly*) TARGET="freebsd" ;; # mislabelled bsd with x86 asm - *bsd* | *dragonfly*) TARGET="bsd" ;; *-darwin*) TARGET="macosx" ;; *-solaris*) TARGET="generic" ;; - *-cygwin*) TARGET="generic" ;; - *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; + *) die "Unknown target; please update the ebuild to handle ${CHOST}" ;; esac # Needed for Clang 16 diff --git a/app-arch/upx-bin/Manifest b/app-arch/upx-bin/Manifest index 87ef58e1a60b..99b8f0e2dd90 100644 --- a/app-arch/upx-bin/Manifest +++ b/app-arch/upx-bin/Manifest @@ -1,14 +1,14 @@ -DIST upx-4.0.0-amd64_linux.tar.xz 509584 BLAKE2B 18ec4cb6ddd04abaa2493164938e65c868e457d9554a0a93f1526cc46effee8f70130d0351fb49399bb31e62b04b344905c69f0c337ca608c4cf1fb1e62ae190 SHA512 48e9e4c78fc7a7358fcb66996870eb9ae39945e99b68c87b196d33a95d7b8bfd7d9e904eb3dce8a8bdbde68c0d2c8dbec4e55014aae330c7faed324f000c9950 -DIST upx-4.0.0-arm64_linux.tar.xz 494992 BLAKE2B 53e029a4e7b9ec44f60eaaf2255860a30d2b27e288e60dbad223936f1cc5a61011b52341f89a1b62636adea28c27361fbe774917d2c7f0bc5a781e5f5bd067b9 SHA512 c35d8f96acbc35d3cf05236a811917c671b01c52fadf792379dc867b3b5bf1c0edb7f5a1255577622dec218e9cfa8808c37725810d16245c2d0b4c0764ca3451 -DIST upx-4.0.0-armeb_linux.tar.xz 571268 BLAKE2B f3921ac4dcf3aa30309e3f766b5ba5c2aca3f29832f99964ce6339bb2d432c20f70dc8f10ef56433cbe702b6eefca9b3fecf8592e5f3303c7f7313dac0a8d539 SHA512 0c9f73746bc7af8e21c9ae5ed30f0466141c35a21bcefc3d49b2e7056c1238bb17b996a4b264c73739c2c3334376e4eb9dbbd6c1ea59d4bdfb0f10b2059027e0 -DIST upx-4.0.0-i386_linux.tar.xz 540496 BLAKE2B 2e284c59f5330ce64d1bf99e2dae65dbd76ab2713be47ac36d03f263cf136343847d1e6554e318959c10f10f491fff739d92ad2785513ea39a039875d3d8b90a SHA512 34e83ad5f7509981291919d251a386a26c4eb6b0e4c2f6ad4d8c3023fd86c953f1e55f2aa8a93bf64134731f18f71236068a01c78e5e61340ec2875dd84c2176 -DIST upx-4.0.0-mipsel_linux.tar.xz 552492 BLAKE2B eeb3bf051d5770cd4cc3a776ff3bd824408fec284adb30aacd592d7b1705778cedad37ced0f7b4a9568f234209c69d3e73f8553d8ec638e6e064775332f88df5 SHA512 c29dd06e64a7c79a0e157e4eb135dd9540b40e58611c0b77c3cfab9c1ebac174c2dae512a3f2427b6f4a5c8f94d52e0574845056331067fe3954c616e8115427 -DIST upx-4.0.0-powerpc64le_linux.tar.xz 560504 BLAKE2B c34d3259af01990f934b643dd59fef89dcb7d7471aa5012b231e584c80eb7b763b331c9433813ea573e9b638077ab701d1cf02e387418e601eba08de5efe7497 SHA512 46319b4737e6d8f6dd4f6b72ddcfe3a2e6755b87a58ec789017a598f3ddc44706770f5fe3e820de6df8348fc6ad42baced240aad77275c867f55d6d4e13b7ab0 -DIST upx-4.0.0-powerpc_linux.tar.xz 552572 BLAKE2B 2569b29618d828c8a7ff08cb2e302c6201b8422f0ba8eaa78b483c770839795121d12165dd8448812524f63dce115a9d0cfbe07ffde4465ddde7aad0bace136d SHA512 6b9135d482704a81e14d99b223c7f623f79933f09901f94c31a605da3ae0118af513785c9efec6c66d1395d27ce56fe2e25b2830b34652264c8298bae975b882 -DIST upx-4.0.1-amd64_linux.tar.xz 560000 BLAKE2B 10d1e3b0aa53a4b86974bb0e8fa8a5adbb6112a0c2134748e62a6890c8c02446311ab0b33e61dc98dd5905d70bbff1265169027e81149d527b547eaa822b482f SHA512 907e178c19673fc5e9a26733b03d5e5b442c2cae01e03abbe44f170671efb601a337cfdaba17f2e56217a3bebea6a29318d80f81e9853000d4012a742795e533 -DIST upx-4.0.1-arm64_linux.tar.xz 570728 BLAKE2B c23db0fcf6ca79a464151518befe4ddccc347b7364e679f3d87f5dfea3c7b10bc33559125e664fc08508335eddbc263cc7ff2383274b9f15c29b03ecfcdeb33b SHA512 6e1bebd7e561409c2f37cdcbfb2a7a6f923b11acce21df5f21abfa2db172932129ebf06311ab167b8e05886d4b457c9ade6d6e8181c1c90a7ef843fbdae6b089 -DIST upx-4.0.1-armeb_linux.tar.xz 571196 BLAKE2B 0719eaccdb3e940d95d8104bd27fa9d9fddb8212200d6598d78a10070f0f21b7371a1e64b6c9d50f823631120505a181f66f73e4352430f1dec876072ad1a12c SHA512 5fa40d3fc06092a4c301c3ef347c242b8ebdee2bdcd3621755e50d4cdbcf826627b5da2aedcface2d4591a9770184a7186b16b9872cdf114b1cbab5c5cf47f71 -DIST upx-4.0.1-i386_linux.tar.xz 595536 BLAKE2B e68211c6db05fddb5fadb4c628d7ce0c29dc9f80c1770ce9ddf90a7a6e780e5d1cf3426a5fe76765b81aeb8bc9df7a468a0d8bd4918c7cd15da4747dc248080b SHA512 c700a7138fbcbb1c510c56f49a43c17604ef2aa192c0c8336d59bf9a5454635131b48c004a070833198cd0df23c2600d46f9293b990a43576762e0eb3334203f -DIST upx-4.0.1-mipsel_linux.tar.xz 650372 BLAKE2B e5294055953ff599ae1f5ce0cc39dbd42fb0a53bdd6a8b833e97bb2717225dbd0c6c449274a3d4fb400ac86caf6e118617784bbe722843adf1767c866fef58a7 SHA512 266292e6027852d017b0e2725db4216230b362f7e2070008dde020b2d83c980ba7b50219f3d3a9914ef8f185799abb14cdfc55620bf532a1678bd3c1c5ccb025 -DIST upx-4.0.1-powerpc64le_linux.tar.xz 651596 BLAKE2B 4c9ebdc3c4873cbb2cd9483ba406f2600e9c54e54bb29c928b9f5ca0726f1ecc49c5f62be1d29ce8f2a750f269d32ee3a5165c60aaa4de923f4f8571a0f08829 SHA512 9d9618341f55af77ce02dfb7587b6a90c8657fedff6be0f39c7c1ae83134aeeddccf1713a13835c44d9f9f6d9021294b8bce7fc527f3e76825c96a4cbbb55843 -DIST upx-4.0.1-powerpc_linux.tar.xz 649004 BLAKE2B 0dc543960946fc4293ae985ea04a60dea5052c661ed2f9b5aa18764bf3072a502cff7e183233abda24b713a38cc70d6e7495dbf9a980405eb3e7c3dbff765667 SHA512 7f40898b6ab03de038c37b524db93639a8cb3b502a15bff28f61d50f9fc3eef1e89e3226d2c15fc0a52db4efd7c4b384303932e43f57d75f9d18a09057ed4292 +DIST upx-4.1.0-amd64_linux.tar.xz 584124 BLAKE2B c681883799a18d8ab05c06fc0d6890ae14f14191fabaf2655d91dc35ef51c18e822dfb40fcfb7a6a2952c65967e2941c5c5a5a8d75ea9d6fee93007de2358d72 SHA512 43739e7abcb895b55e84836eaab50540aba2eda45913d75412228428e64983e1fe29d7c21a471a1b6ebcdc331b7da6051775ffabb59f67a38b52d4d61e74e0ae +DIST upx-4.1.0-arm64_linux.tar.xz 596652 BLAKE2B 7ce7deff35245aa8f63b3340a22ef94691f45eca3b2236016d333d7acf6ed254d68491b574b31fb49af2faeaabbd67259183d06378bf3dcd2da7aa1b4f3390ba SHA512 267c954cf58c3c3e4d89fb754970beb200fe26ea34bd67ab8775d579eadb739e2195579c590a09ea633a514635ac6de838803ae0d79eb37a92e18ce12fe0ac5a +DIST upx-4.1.0-armeb_linux.tar.xz 595696 BLAKE2B 56fe546dea5b352c8016cfa75d2676dc3b7da5029accc55888ac6abffa768f786adac11a74269e074473cf30e2ea9e5ba5761a886259f242be34efd1f81a31e9 SHA512 41e73b42300ee3ababca13cf8e60373254288c6f6e0d7b9df1d245f12c1657ddc2f89fbaaa88b503d6959f32433d846c6eef8b81f8068be229fa018f614f2cbf +DIST upx-4.1.0-i386_linux.tar.xz 620220 BLAKE2B db56d61ae8abe1e0a776f994bcd855f96c650789f6a43e0ea33d1d73868b2d63dc5f371b998cf2cef06f3c63ad4ba12600e5cd9faa37ceeb5f723fe05914026a SHA512 5de3870fa5ac2c1e6375035f15d0d8efc7e47a5e1b8ef38872e0631ffbb060cbb1e8494814b3e3b3f6507c4bf44b42c3da554562a5b31b8283f3f39fba5a1ece +DIST upx-4.1.0-mipsel_linux.tar.xz 678296 BLAKE2B 6c7601405b66c25ea7d5a902d137a737ea9f88c92ab152cd322db03fff2f4166802d41321aedac33ef31f903362ef7f6896998916a417a97a5fd539250fb1914 SHA512 23c0fc515bfd1cad35ad1241ecedfc938b8061e63311abeee3eb0c01f9dc502ce9d4be68e0f19354893b0936c1bd9e6795e40c458255e18df63edf0f42424157 +DIST upx-4.1.0-powerpc64le_linux.tar.xz 674196 BLAKE2B cf6dfeea30f5054d8c9f69d88b8ff8c3d6f5e50e0ceab8fef8b51b403b96e571f2d73411d214743baedd7c12711047e0595349ca466373871a433035ca6cde30 SHA512 0f19ea1e04e7e226d2cd864e556170c7324f15bd3163458be1316ff9366b670eafe8a2d781220308efdb930941cb841a9a33702db7df61fec4b0521835a54bc7 +DIST upx-4.1.0-powerpc_linux.tar.xz 675776 BLAKE2B 1ba5df26208c5781c33b18b7a1036a83bd9409a49fb30e54c64f04f16ec7a99bb83bbbc89dfdd9aff42acc866976803cc81706d077cab8275887999462ed44d0 SHA512 91584f0b3d257bc4b29631bf45313f9d226cd53e8629b0655bbb7d2b4c7a5450cfbf2b52c108bb7c727a17ffdb4afcb4baa9cb029c30dae057bf2d717d8ffea6 +DIST upx-4.2.3-amd64_linux.tar.xz 589416 BLAKE2B 88eb4f85477c589e7682b13faee4f9df8cb2021782e88cdde7f82c49dd77cfede269bef8f476e994749fcbadae459de8192a38aa0e17928a33156c54c032f8ae SHA512 0ec084ba2049cd283e5a14124bc130b69b55d1cafb19bb342516cf0a45ace4f247a0f11aaf0c302224998372222853768fcd8a50fd1c7828cdf9f1b0edfd47f9 +DIST upx-4.2.3-arm64_linux.tar.xz 600184 BLAKE2B 7d80b0eba5cef383af1cf8b31b22cd7e51002292f250f84313609338a2878b5a88c9caea8e8df4936bbd00ffc326b806e6dff897651f2219305e7abb56702a15 SHA512 1c7ac30057b564a9ae5ee4835f0662b203e1915931d82dad9369dd4d80565959f32afff07898b7a59630ec883cb215b6f41356abf35e5b400dde7ab4e9f88541 +DIST upx-4.2.3-armeb_linux.tar.xz 601892 BLAKE2B 5770139392ca379be96a7181420557d964ece2766e0dad0a315d0629b3e49b543cc8fbb3387e17cc92d26fdad65ff628341ef53e256c8ae910a744409d47d492 SHA512 bed641247a73b78cddb22940655691f60d87d7bcf3050d5ad14b3abc569c83f824433697a6790e3dd5fe029d6df2aad6878da13bb6fc8979d8a5e224d04a5504 +DIST upx-4.2.3-i386_linux.tar.xz 640800 BLAKE2B 995b9814ac25acbb10559f1b7594352cf80c104b554f0033391b7972b741cf35eed89cba6208f09298e08b861f4be17f567151793e504a7b8310da663faf7670 SHA512 bba0ca8f8438e01259ed2a3a30127777ea7cce3674b03eb5d7a96c32ed0028d3b06ab199973644d70e09aa405dec303434b4e318d99e1aa8d9db1c12c1deeb81 +DIST upx-4.2.3-mipsel_linux.tar.xz 684724 BLAKE2B e540b8b0ee7365a8b64ace9370f4f8c182995218eb1b4230ae094baddb75178e7eab06bd693f663c5e1f38f96ce66aa036f6792fcc6cedd9c8554a85b23a9027 SHA512 70e5fd35d36a6118afe10594ec17076ea0f4ba954edf7a15dd91a7dad1ca3ee9ed717fd31865fcd5611cb551d4f53b946daa14ce84d7a33f74b4d3ee85f7512b +DIST upx-4.2.3-powerpc64le_linux.tar.xz 673892 BLAKE2B cb48edf50219d1abe2524661dae7f0d3e5adbcf84db5d913c13a392b0ce6dc9d6c3c5589a2898d1d192d596ade52aa32d612849de21edba46eb807e2d01b76c0 SHA512 016ef2ed437bedd8c3c7d26be268d5a183a32b0290968bbf84318d32d0bc7187171d14d2be717c18b00bdefcfd4d068257780d1fd34dbcd300c9d4f759f05e34 +DIST upx-4.2.3-powerpc_linux.tar.xz 677584 BLAKE2B cb3a835fccf7e233e7dc8bbd4bee226901bbd8c82c5210199ce713cab1c03fa2ab6ada5825f7052d01688db571e1466acee963b4e09787cc65ec07791981f33c SHA512 deb0a6f088a62642142b02f2fc73790dc7c5b60cf6189fe9cde2aa259b9ec777ac5007c9168c4e5d71beb24d268d18b04c4c3e326a693edcb80d487dc3915145 diff --git a/app-arch/upx-bin/upx-bin-4.0.1.ebuild b/app-arch/upx-bin/upx-bin-4.1.0.ebuild index 0a5aabf6cf03..c715b092fa07 100644 --- a/app-arch/upx-bin/upx-bin-4.0.1.ebuild +++ b/app-arch/upx-bin/upx-bin-4.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,6 +17,8 @@ SRC_URI="x86? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-i386 ppc? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-powerpc_linux.tar.xz ) ppc64? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-powerpc64le_linux.tar.xz )" +S="${WORKDIR}" + LICENSE="GPL-2+ UPX-exception" SLOT="0" KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86" @@ -25,8 +27,6 @@ RESTRICT="strip" RDEPEND="!app-arch/upx" BDEPEND="app-arch/xz-utils[extra-filters]" -S="${WORKDIR}" - QA_PREBUILT="/opt/bin/upx" src_install() { @@ -35,5 +35,5 @@ src_install() { dobin upx pax-mark -m "${ED}"/opt/bin/upx doman upx.1 - dodoc NEWS README THANKS upx-doc.html upx-doc.txt + dodoc NEWS README THANKS.txt upx-doc.html upx-doc.txt } diff --git a/app-arch/upx-bin/upx-bin-4.0.0.ebuild b/app-arch/upx-bin/upx-bin-4.2.3.ebuild index a6902194c16d..1014c4fbaab6 100644 --- a/app-arch/upx-bin/upx-bin-4.0.0.ebuild +++ b/app-arch/upx-bin/upx-bin-4.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,6 +17,8 @@ SRC_URI="x86? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-i386 ppc? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-powerpc_linux.tar.xz ) ppc64? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-powerpc64le_linux.tar.xz )" +S="${WORKDIR}" + LICENSE="GPL-2+ UPX-exception" SLOT="0" KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" @@ -25,8 +27,6 @@ RESTRICT="strip" RDEPEND="!app-arch/upx" BDEPEND="app-arch/xz-utils[extra-filters]" -S="${WORKDIR}" - QA_PREBUILT="/opt/bin/upx" src_install() { @@ -35,5 +35,5 @@ src_install() { dobin upx pax-mark -m "${ED}"/opt/bin/upx doman upx.1 - dodoc NEWS README THANKS upx-doc.html upx-doc.txt + dodoc NEWS README THANKS.txt upx-doc.html upx-doc.txt } diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest index 05cc0c7a1149..58606ce802e6 100644 --- a/app-arch/upx/Manifest +++ b/app-arch/upx/Manifest @@ -1 +1,2 @@ -DIST upx-4.0.1-src.tar.xz 1154032 BLAKE2B 0da23cedf73506e06e5dcf19ab0d194d8e578188bb4d75e760fe3f7dc7f24a9d42ff4b75fd9514162f48ae7cfad347b5bd65789805071354a74129960807843b SHA512 f2e42c83fd4a0d273a20c8b0f0d1eb201edcd1f10c779d2a6e8ac0812741c3af0c887382e54894190ecc4c7002a910524b2ed79ae7a7b595b8392598ad2e1235 +DIST upx-4.1.0-src.tar.xz 1267708 BLAKE2B ef7884028a97b1d7e542fc27756b705582786a22d193b1eef40d0db16580958baddc3baa44429b5ba2c0f7b5d4d0f4f79fdeb777af016b962b07c7639a319090 SHA512 de8306e833198d7f470c050b05c6111a50ea94f2e757c1006433742871ccd93fd7412f942cd776e9eac6c91e379545d72f070f3fe928e75e5d5092b766474f8c +DIST upx-4.2.3-src.tar.xz 1283824 BLAKE2B 2b53bf68196c35c05eb930760ad20446fbcde9b15e1e9261e2eb7553dc1c8ede48db952cd7c5bc6de5861ac98f9f62bb1d348806731fea7dad1e532fc7e1e636 SHA512 b9ebda5d3372132bb861e0dd035829b16e4c06900f68af182895f17975493707d78cbabc63060e581de1ce149bb5129d883f6e6abcde0413c0bf474db919f5fd diff --git a/app-arch/upx/files/upx-4.0.1-CVE-2023-23456.patch b/app-arch/upx/files/upx-4.0.1-CVE-2023-23456.patch deleted file mode 100644 index 779800a08e40..000000000000 --- a/app-arch/upx/files/upx-4.0.1-CVE-2023-23456.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 1d291ff0db8a056600ebdebb9c3c62d700eaa842 Mon Sep 17 00:00:00 2001 -From: John Reiser <jreiser@BitWagon.com> -Date: Thu, 24 Nov 2022 10:28:03 -0800 -Subject: [PATCH] p_tmt: more sanity of input, cleanup MemBuffer usage - -https://github.com/upx/upx/issues/632 - modified: src/p_tmt.cpp ---- - src/p_tmt.cpp | 23 +++++++++++------------ - 1 file changed, 11 insertions(+), 12 deletions(-) - -diff --git a/src/p_tmt.cpp b/src/p_tmt.cpp -index 7dc72888..592809a9 100644 ---- a/src/p_tmt.cpp -+++ b/src/p_tmt.cpp -@@ -173,15 +173,13 @@ int PackTmt::readFileHeader() - fi->seek(adam_offset,SEEK_SET); - fi->readx(&ih,sizeof(ih)); - // FIXME: should add more checks for the values in 'ih' -- unsigned const imagesize = get_le32(&ih.imagesize); -- unsigned const entry = get_le32(&ih.entry); -- unsigned const relocsize = get_le32(&ih.relocsize); -- if (!imagesize -- || file_size <= imagesize -- || file_size <= entry -- || file_size <= relocsize) { -- printWarn(getName(), "bad header; imagesize=%#x entry=%#x relocsize=%#x", -- imagesize, entry, relocsize); -+ unsigned const imagesize = ih.imagesize; -+ unsigned const entry = ih.entry; -+ unsigned const relocsize = ih.relocsize; -+ if (imagesize < sizeof(ih) || entry < sizeof(ih) || file_size <= imagesize || -+ file_size <= entry || file_size <= relocsize) { -+ printWarn(getName(), "bad header; imagesize=%#x entry=%#x relocsize=%#x", imagesize, -+ entry, relocsize); - return 0; - } - -@@ -215,15 +213,16 @@ void PackTmt::pack(OutputFile *fo) - ibuf.alloc(usize+rsize+128); - obuf.allocForCompression(usize+rsize+128); - -- MemBuffer wrkmem; -- wrkmem.alloc(rsize+EXTRA_INFO); // relocations -+ MemBuffer mb_wrkmem; -+ mb_wrkmem.alloc(rsize + EXTRA_INFO + 4); // relocations + original entry point + relocsize -+ SPAN_S_VAR(upx_byte, wrkmem, mb_wrkmem); - - fi->seek(adam_offset+sizeof(ih),SEEK_SET); - fi->readx(ibuf,usize); - fi->readx(wrkmem+4,rsize); - const unsigned overlay = file_size - fi->tell(); - -- if (find_le32(ibuf,128,get_le32("UPX ")) >= 0) -+ if (find_le32(ibuf, UPX_MIN(128u, usize), get_le32("UPX ")) >= 0) - throwAlreadyPacked(); - if (rsize == 0) - throwCantPack("file is already compressed with another packer"); --- -2.38.2 - diff --git a/app-arch/upx/files/upx-4.0.1-CVE-2023-23457.patch b/app-arch/upx/files/upx-4.0.1-CVE-2023-23457.patch deleted file mode 100644 index 8cb8455b4eab..000000000000 --- a/app-arch/upx/files/upx-4.0.1-CVE-2023-23457.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 779b648c5f6aa9b33f4728f79dd4d0efec0bf860 Mon Sep 17 00:00:00 2001 -From: John Reiser <jreiser@BitWagon.com> -Date: Wed, 23 Nov 2022 19:49:28 -0800 -Subject: [PATCH] invert_pt_dynamic: fix thinko; PackLinuxElf64help1 insist on - ELF - -https://github.com/upx/upx/issues/631 - modified: src/p_lx_elf.cpp ---- - src/p_lx_elf.cpp | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp -index fa55470f7..b698ee0a2 100644 ---- a/src/p_lx_elf.cpp -+++ b/src/p_lx_elf.cpp -@@ -256,7 +256,8 @@ PackLinuxElf32::PackLinuxElf32help1(InputFile *f) - e_phnum = get_te16(&ehdri.e_phnum); - e_shnum = get_te16(&ehdri.e_shnum); - unsigned const e_phentsize = get_te16(&ehdri.e_phentsize); -- if (ehdri.e_ident[Elf32_Ehdr::EI_CLASS]!=Elf32_Ehdr::ELFCLASS32 -+ if (memcmp((char const *)&ehdri, "\x7f\x45\x4c\x46", 4) // "\177ELF" -+ || ehdri.e_ident[Elf32_Ehdr::EI_CLASS]!=Elf32_Ehdr::ELFCLASS32 - || sizeof(Elf32_Phdr) != e_phentsize - || (Elf32_Ehdr::ELFDATA2MSB == ehdri.e_ident[Elf32_Ehdr::EI_DATA] - && &N_BELE_RTP::be_policy != bele) -@@ -761,7 +762,8 @@ PackLinuxElf64::PackLinuxElf64help1(InputFile *f) - e_phnum = get_te16(&ehdri.e_phnum); - e_shnum = get_te16(&ehdri.e_shnum); - unsigned const e_phentsize = get_te16(&ehdri.e_phentsize); -- if (ehdri.e_ident[Elf64_Ehdr::EI_CLASS]!=Elf64_Ehdr::ELFCLASS64 -+ if (memcmp((char const *)&ehdri, "\x7f\x45\x4c\x46", 4) // "\177ELF" -+ || ehdri.e_ident[Elf64_Ehdr::EI_CLASS]!=Elf64_Ehdr::ELFCLASS64 - || sizeof(Elf64_Phdr) != e_phentsize - || (Elf64_Ehdr::ELFDATA2MSB == ehdri.e_ident[Elf64_Ehdr::EI_DATA] - && &N_BELE_RTP::be_policy != bele) -@@ -5780,7 +5782,7 @@ PackLinuxElf64::invert_pt_dynamic(Elf64_Dyn const *dynp, upx_uint64_t headway) - } - if (file_size <= dt_offsets[n_off]) { - char msg[60]; snprintf(msg, sizeof(msg), "bad DT_{%#x} = %#x (beyond EOF)", -- dt_names[k], dt_offsets[n_off]); -+ k, dt_offsets[n_off]); - throwCantPack(msg); - } - n_off += !!dt_offsets[n_off]; diff --git a/app-arch/upx/upx-4.0.1-r1.ebuild b/app-arch/upx/upx-4.1.0.ebuild index 16adb6cdbc4e..44d1747d853c 100644 --- a/app-arch/upx/upx-4.0.1-r1.ebuild +++ b/app-arch/upx/upx-4.1.0.ebuild @@ -17,11 +17,6 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" RDEPEND="!app-arch/upx-bin" BDEPEND="app-arch/xz-utils[extra-filters]" -PATCHES=( - "${FILESDIR}/${P}-CVE-2023-23456.patch" - "${FILESDIR}/${P}-CVE-2023-23457.patch" -) - src_configure() { local mycmakeargs=( -DUPX_CONFIG_DISABLE_WERROR=ON diff --git a/app-arch/upx/upx-4.2.3.ebuild b/app-arch/upx/upx-4.2.3.ebuild new file mode 100644 index 000000000000..83d85276513a --- /dev/null +++ b/app-arch/upx/upx-4.2.3.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Ultimate Packer for eXecutables (free version using UCL compression and not NRV)" +HOMEPAGE="https://upx.github.io/" +SRC_URI="https://github.com/upx/upx/releases/download/v${PV}/${P}-src.tar.xz" +S="${WORKDIR}/${P}-src" + +LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="!app-arch/upx-bin" +BDEPEND="app-arch/xz-utils[extra-filters]" + +src_configure() { + local mycmakeargs=( + -DUPX_CONFIG_DISABLE_GITREV=ON + -DUPX_CONFIG_DISABLE_WERROR=ON + -DUPX_CONFIG_CMAKE_DISABLE_TEST=$(usex !test) + ) + cmake_src_configure +} + +src_test() { + # Don't run tests in parallel, #878977 + cmake_src_test -j1 +} diff --git a/app-arch/vimball/vimball-0.5.1.ebuild b/app-arch/vimball/vimball-0.5.1-r1.ebuild index f648d5ae65b4..9f4edd4d930f 100644 --- a/app-arch/vimball/vimball-0.5.1.ebuild +++ b/app-arch/vimball/vimball-0.5.1-r1.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 if [[ ${PV} == *9999 ]] ; then @@ -12,11 +13,14 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else KEYWORDS="amd64 x86" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + inherit pypi fi -DESCRIPTION="a command-line vimball archive extractor" -HOMEPAGE="https://github.com/radhermit/vimball" +DESCRIPTION="A command-line vimball archive extractor" +HOMEPAGE=" + https://github.com/radhermit/vimball/ + https://pypi.org/project/vimball/ +" LICENSE="MIT" SLOT="0" diff --git a/app-arch/vimball/vimball-9999.ebuild b/app-arch/vimball/vimball-9999.ebuild index eed176d67ea1..368e668cb296 100644 --- a/app-arch/vimball/vimball-9999.ebuild +++ b/app-arch/vimball/vimball-9999.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 if [[ ${PV} == *9999 ]] ; then @@ -12,11 +13,14 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + inherit pypi fi -DESCRIPTION="a command-line vimball archive extractor" -HOMEPAGE="https://github.com/radhermit/vimball" +DESCRIPTION="A command-line vimball archive extractor" +HOMEPAGE=" + https://github.com/radhermit/vimball/ + https://pypi.org/project/vimball/ +" LICENSE="MIT" SLOT="0" diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest index b34d8317072a..a7bd60bb4ea2 100644 --- a/app-arch/wimlib/Manifest +++ b/app-arch/wimlib/Manifest @@ -1 +1,2 @@ DIST wimlib-1.13.4.tar.gz 1040411 BLAKE2B 4563429d42be39b959a15ef66ac4c173531ff0c0b0f1a341812a4f870c9f189478f3ce78bf6240544f71b1746d98c9eae3f7182d646355343e26526559384f07 SHA512 480fe6fa6c6e8f1bf9c3960f5e1671f3266535b18dc72e9d7c4c05c7fb833d9b00db5ae9fb49154da6e71e536cae8b562cbf81ab5a124e2a79326927e2cf7344 +DIST wimlib-1.14.1.tar.gz 1046078 BLAKE2B 56e44928229c9c4fda662fa64fc4021bd361c2c959f0786764b84fa4cc9d7f7b0d5440edb4d4079657cc7bf450ac9c755f554c7da7a8b2b7e96d69ddbeb4f22f SHA512 9f92a8ce2d386918d66a1a3e52d4fbffeeb9f8b9345b25012fd0bd07039a00be84fd83d83a9bb25bcefab09597a81e9392522be835dd6693dd00050f8624af00 diff --git a/app-arch/wimlib/wimlib-1.14.1.ebuild b/app-arch/wimlib/wimlib-1.14.1.ebuild new file mode 100644 index 000000000000..14ba614885b5 --- /dev/null +++ b/app-arch/wimlib/wimlib-1.14.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools pax-utils + +DESCRIPTION="The open source Windows Imaging (WIM) library" +HOMEPAGE="https://wimlib.net" +SRC_URI="https://wimlib.net/downloads/${P}.tar.gz" + +LICENSE="|| ( GPL-3+ LGPL-3+ ) MIT" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="fuse iso ntfs test yasm" +RESTRICT="!test? ( test )" + +RDEPEND=" + fuse? ( sys-fs/fuse:3 ) + iso? ( + app-arch/cabextract + app-cdr/cdrtools + ) + ntfs? ( sys-fs/ntfs3g:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_with ntfs ntfs-3g) + $(use_with fuse) + $(use_enable test test-support) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + default + pax-mark m "${S}"/.libs/wimlib-imagex +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest index e925d356fafd..5fb4e06ff4ff 100644 --- a/app-arch/xar/Manifest +++ b/app-arch/xar/Manifest @@ -1 +1,2 @@ DIST xar-487.100.1.tar.gz 224108 BLAKE2B 2fa5c44b46a9e37e49be03d05d6d06ab706b5205d857e6d6f24954160dbf5fc91fbec848053cb2d0a11505e5f7c37f8331ac126d65eb91b08e302a28db12acc0 SHA512 a45d1327ac5c6dc6f1cdb359e7e487fd91cea82a446157b65da34f0481cd58bbe03b0e005643087c802962e89316a1c816e2c6b625f1259b10a52bbf902f79e6 +DIST xar-498.tar.gz 224373 BLAKE2B 56dfae475f23384b57492d6a5e141a4c93f7b0238de04be8bbcde63fe7ca0a9beb137b5b9052b165717cd2afae4ddfe5005e65ba16d1821c42e036a9ef9d0e04 SHA512 ecd6186e42ff3005296d94ce01d7fbea04814f26afe1df0449ffa522009ec85beafc71e25931b215910c159a2440565e7dd31a6a7c50389a50a1368bd5ff5f75 diff --git a/app-arch/xar/files/xar-1.8.0.0.498-impl-decls.patch b/app-arch/xar/files/xar-1.8.0.0.498-impl-decls.patch new file mode 100644 index 000000000000..8c37a6c9cfbc --- /dev/null +++ b/app-arch/xar/files/xar-1.8.0.0.498-impl-decls.patch @@ -0,0 +1,24 @@ +include stdlib.h for free and strtol +silence format warning + +--- a/lib/ext2.c ++++ b/lib/ext2.c +@@ -41,6 +41,7 @@ + #include "asprintf.h" + #endif + #include <stdio.h> ++#include <stdlib.h> + #include <unistd.h> + #include "xar.h" + #include "arcmod.h" +--- a/lib/ea.c ++++ a/lib/ea.c +@@ -67,7 +67,7 @@ + xar_prop_setvalue(XAR_EA(ret)->prop, NULL); + XAR_PROP(XAR_EA(ret)->prop)->attrs = xar_attr_new(); + XAR_ATTR(XAR_PROP(XAR_EA(ret)->prop)->attrs)->key = strdup("id"); +- asprintf((char **)&XAR_ATTR(XAR_PROP(XAR_EA(ret)->prop)->attrs)->value, "%lld", XAR_FILE(f)->nexteaid++); ++ asprintf((char **)&XAR_ATTR(XAR_PROP(XAR_EA(ret)->prop)->attrs)->value, PRId64, XAR_FILE(f)->nexteaid++); + + xar_prop_pset(f, XAR_EA(ret)->prop, "name", name); + diff --git a/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild b/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild index 03064649f76e..55087abbc9d1 100644 --- a/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild +++ b/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/apple-oss-distributions/xar/archive/xar-${APPLE_PV}. LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" DEPEND=" elibc_musl? ( sys-libs/fts-standalone ) diff --git a/app-arch/xar/xar-1.8.0.0.498.ebuild b/app-arch/xar/xar-1.8.0.0.498.ebuild new file mode 100644 index 000000000000..80225ab0a44a --- /dev/null +++ b/app-arch/xar/xar-1.8.0.0.498.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic toolchain-funcs multilib-minimal + +APPLE_PV=$(ver_cut 5-) # 498: macOS 13.3 and up +DESCRIPTION="An easily extensible archive format" +HOMEPAGE="https://github.com/apple-oss-distributions/xar" +SRC_URI="https://github.com/apple-oss-distributions/xar/archive/xar-${APPLE_PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +DEPEND=" + elibc_musl? ( sys-libs/fts-standalone ) + kernel_linux? ( virtual/acl ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] + app-arch/bzip2[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + dev-libs/libxml2[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.1-ext2.patch + "${FILESDIR}"/${PN}-1.8-safe_dirname.patch + "${FILESDIR}"/${PN}-1.8-arm-ppc.patch + "${FILESDIR}"/${PN}-1.8-openssl-1.1.patch + "${FILESDIR}"/${PN}-1.8.0.0.452-linux.patch + "${FILESDIR}"/${PN}-1.8.0.0.487-non-darwin.patch + "${FILESDIR}"/${PN}-1.8.0.0.487-variable-sized-object.patch + "${FILESDIR}"/${PN}-1.8.0.0.498-impl-decls.patch +) + +S=${WORKDIR}/${PN}-${PN}-${APPLE_PV}/${PN} + +src_prepare() { + default + + # make lib headers available (without installing first?) + cd "${S}"/include || die + mv ../lib/*.h . || die + + # strip RPATH pointing to ED + cd "${S}"/src || die + sed -i -e 's/@RPATH@//' Makefile.inc.in || die + + # avoid GNU make (bug?) behaviour of removing xar.o as intermediate + # file, this doesn't happen outside portage, but it does from the + # ebuild env, causing the install phase to re-compile xar.o and link + # the executable + echo ".PRECIOUS: @objroot@src/%.o" >> Makefile.inc.in || die + + # drop Darwin specific reliance on CommonCrypto Framework, for it + # depends on what version of Darwin we're on, and it is much simpler + # to just use openessl instead, which we maintain and control + cd "${S}" || die + sed -i -e 's/__APPLE__/__NO_APPLE__/' \ + include/archive.h \ + lib/hash.c \ + || die + + # fix branding somewhat + sed -i -e "/XAR_VERSION/s|%s|%s (Gentoo ${PVR})|" src/xar.c || die + + eautoreconf +} + +multilib_src_configure() { + append-libs $($(tc-getPKG_CONFIG) --libs openssl) + use elibc_musl && append-libs $($(tc-getPKG_CONFIG) --libs fts-standalone) + append-cflags -Wno-unused-result # allow to see real problems + ECONF_SOURCE=${S} \ + econf --disable-static + # botched check, fix it up + if use kernel_SunOS ; then + sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die + fi + # allow xar/xar.h to be found + ( cd include && ln -s . xar ) +} + +multilib_src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest index 1f4bef629452..b9ac1aeed370 100644 --- a/app-arch/xarchiver/Manifest +++ b/app-arch/xarchiver/Manifest @@ -1 +1 @@ -DIST xarchiver-0.5.4.20.tar.gz 1120317 BLAKE2B dbeb21492a4045d504aac92c28847a91c23e0feedeb82074fe89736f64b2b7d09b41bbefe321441c51736a8273267ac13dd616d4f61ba1b9e72cc805e749aa79 SHA512 c05be6f69a576988ca1a67c1664e4e4e3c53588ef4c85ce943e204ae72b08e705eb20be1018274c5420e30c5ed71d773bdacccc538ab458d658fba494c097777 +DIST xarchiver-0.5.4.23.tar.gz 1126908 BLAKE2B 09d2217aa77d553fd9f8436e1336f95160c366318b43ed22b9693f5dd510c59544d95f1cf643046ba443b44de84792a71d6eb115ad5bd04ab33e03c91e00afd4 SHA512 7459b14772205872de275c855c26a992a6a59e773cdaef25f95a44528baf1d1db7b1d1ef8540e0508babd35468f46c96db9610cc12746947ecccd9332bb69a71 diff --git a/app-arch/xarchiver/xarchiver-0.5.4.20.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.23.ebuild index 24dc0123a4de..8a53c3d8b670 100644 --- a/app-arch/xarchiver/xarchiver-0.5.4.20.ebuild +++ b/app-arch/xarchiver/xarchiver-0.5.4.23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="doc" DEPEND=" diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest index 8e72b07133e1..ec1a06d7c64c 100644 --- a/app-arch/xz-utils/Manifest +++ b/app-arch/xz-utils/Manifest @@ -1,4 +1,4 @@ -DIST xz-5.2.10.tar.gz 2123206 BLAKE2B fdd9e77e21ee65482401e0e43e0b291093a227d452991a9182562989b7a4388ceed30d5d54cd7f86320dcc073eb792032a49741880338a29043a8380507c4215 SHA512 c3814680fcad421efa71cf977217a62c34e3223900302a6fd7d505f310a7b338815feee2c8225b1232bd22b9e29c7dda3664e54dae2d80f816daec6adf560ca1 -DIST xz-5.2.10.tar.gz.sig 566 BLAKE2B ce72730816d03084dc0d1559d6f2890b3ebe25a5e6b0720d4775ba2364762b5d1934a3a53f2255f6e68a1cdf42778d85d8b02ab30396b2addab619e95855f733 SHA512 48a0864abee6639116678afab6e8319eb2de903b381362c611fb77f9b6fc21df5f7d9783a250810f7ecc08380fb371a3a791ab55f5a343b68b9d4f9e414da403 -DIST xz-5.4.1.tar.gz 2528617 BLAKE2B f4dc8698fb97002aa0548107b448ab0dd8659cce506a83775930f95fd775601f7de1df44866310ac617853410a1915cd4e90ad4088b2fd56418e67b6f0fc4e98 SHA512 5cff8383a68fb88ecbb3770ec48af0ad5582e08de9dccd339e0b685aaa53447e59d6425caa3f63b54a674e5d78c20520876db547d156e6658ad4841660cba85b -DIST xz-5.4.1.tar.gz.sig 566 BLAKE2B f384bcf7ea6bd7d3af65b6b17b379b48826257f403bca0bed1b42697f88edbc38f38eaac03c5564fc466df670f40e2e7ee49974232da4eb849718e89234c224b SHA512 2e6c3bf04ceb29c1bac8fdde7aa09c4d0f96442515d797e06ea860f365fd94777630b0034b98006cf844083efea8642a0bf87b1ff56de6a58446a644b1fd3c1c +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 diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml index 89d8ff67986f..3b217f332fdd 100644 --- a/app-arch/xz-utils/metadata.xml +++ b/app-arch/xz-utils/metadata.xml @@ -9,6 +9,7 @@ <flag name="extra-filters">Build additional filters that are not used in any of the default xz presets. This includes delta and BCJ coders, additional match finders and SHA256 checks.</flag> + <flag name="pgo">Optimize the build using Profile Guided Optimization (PGO)</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:tukaani:xz</remote-id> diff --git a/app-arch/xz-utils/xz-utils-5.2.10.ebuild b/app-arch/xz-utils/xz-utils-5.4.2.ebuild index fb35eaff7363..a6187bec0743 100644 --- a/app-arch/xz-utils/xz-utils-5.2.10.ebuild +++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild @@ -1,34 +1,41 @@ -# Copyright 1999-2022 Gentoo Authors +# 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=7 +EAPI=8 -inherit libtool multilib multilib-minimal preserve-libs usr-ldscript +inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.tukaani.org/xz.git" + # 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 >=sys-devel/libtool-2" + BDEPEND="sys-devel/gettext >=dev-build/libtool-2" else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc + 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 mirror://sourceforge/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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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}" @@ -40,15 +47,12 @@ HOMEPAGE="https://tukaani.org/xz/" # See top-level COPYING file as it outlines the various pieces and their licenses. LICENSE="public-domain LGPL-2.1+ GPL-2+" SLOT="0" -IUSE="+extra-filters nls static-libs" +IUSE="doc +extra-filters pgo nls static-libs" if [[ ${PV} != 9999 ]] ; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )" fi -# Tests currently do not account for smaller feature set -RESTRICT="!extra-filters? ( test )" - src_prepare() { default @@ -64,6 +68,7 @@ src_prepare() { multilib_src_configure() { local myconf=( --enable-threads + $(multilib_native_use_enable doc) $(use_enable nls) $(use_enable static-libs static) ) @@ -98,15 +103,32 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf "${myconf[@]}" } -multilib_src_install() { - default +multilib_src_compile() { + # -fprofile-partial-training because upstream note the test suite isn't super comprehensive + # 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 - gen_usr_ldscript -a lzma + 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 - rm "${ED}"/usr/share/doc/${PF}/COPYING* || die + + if use doc ; then + rm "${ED}"/usr/share/doc/${PF}/COPYING* || die + fi } pkg_preinst() { diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild index 9aa96a389d3e..50f09f3d3417 100644 --- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild +++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# 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=7 +EAPI=8 -inherit libtool multilib multilib-minimal preserve-libs usr-ldscript +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 @@ -18,24 +18,24 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 autotools # bug #272880 and bug #286068 - BDEPEND="sys-devel/gettext >=sys-devel/libtool-2" + BDEPEND="sys-devel/gettext >=dev-build/libtool-2" else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.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://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz mirror://sourceforge/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://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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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}" @@ -47,10 +47,10 @@ HOMEPAGE="https://tukaani.org/xz/" # See top-level COPYING file as it outlines the various pieces and their licenses. LICENSE="public-domain LGPL-2.1+ GPL-2+" SLOT="0" -IUSE="+extra-filters nls static-libs" +IUSE="doc +extra-filters pgo nls static-libs" if [[ ${PV} != 9999 ]] ; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )" + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )" fi src_prepare() { @@ -68,6 +68,7 @@ src_prepare() { multilib_src_configure() { local myconf=( --enable-threads + $(multilib_native_use_enable doc) $(use_enable nls) $(use_enable static-libs static) ) @@ -102,15 +103,32 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf "${myconf[@]}" } -multilib_src_install() { - default +multilib_src_compile() { + # -fprofile-partial-training because upstream note the test suite isn't super comprehensive + # 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 + + if tc-is-clang; then + llvm-profdata merge "${T}"/${ABI}-pgo --output="${T}"/${ABI}-pgo/default.profdata || die + fi - gen_usr_ldscript -a lzma + emake clean + emake CFLAGS="${CFLAGS} ${pgo_use_flags}" + fi } multilib_src_install_all() { find "${ED}" -type f -name '*.la' -delete || die - rm "${ED}"/usr/share/doc/${PF}/COPYING* || die + + if use doc ; then + rm "${ED}"/usr/share/doc/${PF}/COPYING* || die + fi } pkg_preinst() { diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild index cb694cd99a4a..d2e98e50e15a 100644 --- a/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/app-arch/xz-utils/xz-utils-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# 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=7 +EAPI=8 -inherit libtool multilib multilib-minimal preserve-libs usr-ldscript +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 @@ -18,24 +18,24 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 autotools # bug #272880 and bug #286068 - BDEPEND="sys-devel/gettext >=sys-devel/libtool-2" + BDEPEND="sys-devel/gettext >=dev-build/libtool-2" else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc + 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://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz mirror://sourceforge/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://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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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}" @@ -45,12 +45,12 @@ 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="public-domain LGPL-2.1+ GPL-2+" +LICENSE="0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )" SLOT="0" -IUSE="+extra-filters nls static-libs" +IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs" if [[ ${PV} != 9999 ]] ; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )" fi src_prepare() { @@ -68,8 +68,10 @@ src_prepare() { 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 @@ -102,15 +104,70 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf "${myconf[@]}" } -multilib_src_install() { - default - - gen_usr_ldscript -a lzma +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 + + if multilib_is_native_abi ; then + ( + shopt -s globstar + + tar \ + --sort=name --mtime=@2718281828 \ + -cf xz-pgo-test-01.tar \ + {"${S}","${BUILD_DIR}"}/**/*.[cho] \ + {"${S}","${BUILD_DIR}"}/**/*.so* \ + {"${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 + md5sum xz-pgo-test-01.tar + ) + + local test_variants=( + # Borrowed from ALT Linux + # 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' + '-7e --format=lzma' + + # Our own variants + '' + '-9e' + '--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 - rm "${ED}"/usr/share/doc/${PF}/COPYING* || die + + if use doc ; then + rm "${ED}"/usr/share/doc/${PF}/COPYING* || die + fi } pkg_preinst() { diff --git a/app-arch/zchunk/Manifest b/app-arch/zchunk/Manifest new file mode 100644 index 000000000000..3ea0402f20fb --- /dev/null +++ b/app-arch/zchunk/Manifest @@ -0,0 +1,2 @@ +DIST zchunk-1.3.2.tar.gz 1508683 BLAKE2B a8b866d28e3a0f5bf5fda3b44f5f1d0589c374dd700d8c64497d729758e35ed1215367ff8b1114e436a776a419f1aa329f429016981f11c19fd0896db3520811 SHA512 32f3167db747a494373c03941450e8b6b7eb6ad6a07633ccb9dbd3176ffb79073746bbdf3f132605ad51de23b3b20434d1580cf7cd72e0b658263bb32359f5bc +DIST zchunk-1.4.0.tar.gz 1513670 BLAKE2B 97fa848f7f760874f4a521153983fb8263680ff57f04644ed124aa1c81fcb36d068d489c83bd95e2e4e70efa79892a835c10be8b61a3674550e8218f23852ac4 SHA512 7fbe50182d46e4e8ce8730959cd97ea39b48dd77d034303435ce15caec194409984d435167d3b55769577d6be6c539573eddd9351f178377a756babc508d6281 diff --git a/app-arch/zchunk/metadata.xml b/app-arch/zchunk/metadata.xml new file mode 100644 index 000000000000..fa8442f5cd87 --- /dev/null +++ b/app-arch/zchunk/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>kangie@gentoo.org</email> + <name>Matt Jolly</name> + </maintainer> + <upstream> + <remote-id type="github">zchunk/zchunk</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-arch/zchunk/zchunk-1.3.2.ebuild b/app-arch/zchunk/zchunk-1.3.2.ebuild new file mode 100644 index 000000000000..e89d8926554d --- /dev/null +++ b/app-arch/zchunk/zchunk-1.3.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="File format designed for highly efficient deltas with good compression" +HOMEPAGE="https://github.com/zchunk/zchunk" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/zchunk/zchunk.git" +else + SRC_URI="https://github.com/zchunk/zchunk/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/zstd:= + net-misc/curl + dev-libs/openssl:= +" +RDEPEND="${DEPEND}" + +src_configure() { + local emesonargs=( + $(meson_use test tests) + ) + + meson_src_configure +} diff --git a/app-arch/zchunk/zchunk-1.4.0.ebuild b/app-arch/zchunk/zchunk-1.4.0.ebuild new file mode 100644 index 000000000000..0759ca5b2011 --- /dev/null +++ b/app-arch/zchunk/zchunk-1.4.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="File format designed for highly efficient deltas with good compression" +HOMEPAGE="https://github.com/zchunk/zchunk" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/zchunk/zchunk.git" +else + SRC_URI="https://github.com/zchunk/zchunk/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/zstd:= + net-misc/curl + dev-libs/openssl:= +" +RDEPEND="${DEPEND}" + +src_configure() { + local emesonargs=( + $(meson_use test tests) + ) + + meson_src_configure +} diff --git a/app-arch/zchunk/zchunk-9999.ebuild b/app-arch/zchunk/zchunk-9999.ebuild new file mode 100644 index 000000000000..e89d8926554d --- /dev/null +++ b/app-arch/zchunk/zchunk-9999.ebuild @@ -0,0 +1,37 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="File format designed for highly efficient deltas with good compression" +HOMEPAGE="https://github.com/zchunk/zchunk" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/zchunk/zchunk.git" +else + SRC_URI="https://github.com/zchunk/zchunk/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/zstd:= + net-misc/curl + dev-libs/openssl:= +" +RDEPEND="${DEPEND}" + +src_configure() { + local emesonargs=( + $(meson_use test tests) + ) + + meson_src_configure +} diff --git a/app-arch/zip/zip-3.0-r7.ebuild b/app-arch/zip/zip-3.0-r7.ebuild index f1f6d540e823..2797a63290fd 100644 --- a/app-arch/zip/zip-3.0-r7.ebuild +++ b/app-arch/zip/zip-3.0-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,12 +13,12 @@ S="${WORKDIR}"/${MY_P} LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="bzip2 crypt natspec unicode" -DEPEND="${RDEPEND}" RDEPEND="bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )" +DEPEND="${RDEPEND}" BDEPEND="app-arch/unzip" PATCHES=( diff --git a/app-arch/zoo/files/zoo-2.10-implicit-int.patch b/app-arch/zoo/files/zoo-2.10-implicit-int.patch new file mode 100644 index 000000000000..e29f3dff8f1f --- /dev/null +++ b/app-arch/zoo/files/zoo-2.10-implicit-int.patch @@ -0,0 +1,75 @@ +Clang 16 will not allow implicit int function defitions by default. +This patch gives all functions a proper definitons. + +See also: https://wiki.gentoo.org/wiki/Modern_C_porting + +Bug: https://bugs.gentoo.org/878611 +Upstream PR: https://github.com/jduerstock/zoo/pull/1 + +--- a/fiz.c ++++ b/fiz.c +@@ -24,6 +24,7 @@ file by supplying the offset of the file. + void prtctrl (); + void prtch (); + ++int + main(argc,argv) + register int argc; + register char **argv; +--- a/mstime.i ++++ b/mstime.i +@@ -12,6 +12,7 @@ static char mstimeid[]="@(#) mstime.i 2.2 88/01/24 12:47:58"; + Function mstime() converts time in seconds since January 1 of BASEYEAR + to MS-DOS format date and time. + */ ++void + mstime(longtime, date, time) + long longtime; /* input: seconds since Jan 1, BASEYEAR */ + int *date, *time; /* output: MS-DOS format date and time */ +--- a/zoo.c ++++ b/zoo.c +@@ -44,6 +44,7 @@ int next_arg = FIRST_ARG; /* filenames start at this position */ + int arg_count; /* count of arguments supplied to program */ + char **arg_vector; /* vector of arguments supplied to program */ + ++int + main(argc,argv) + register int argc; + register char **argv; +--- a/zoofilt.c ++++ b/zoofilt.c +@@ -41,8 +41,10 @@ char *option; + unsigned int filetag; /* tag stored in input */ + int stat1, stat2, stat3; /* status codes */ + int use_lzh = 0; /* use lzh instead */ +- extern lzc(), lzh_encode(); /* possible encoders */ +- extern lzd(), lzh_decode(); /* and decoders */ ++ extern int lzc(); /* possible encoders */ ++ extern int lzh_encode(); ++ extern int lzd(); /* and decoders */ ++ extern int lzh_decode(); + + while (*++option) { + switch (*option) { +--- a/nixtime.i ++++ b/nixtime.i +@@ -20,7 +20,7 @@ + Function gettime() gets the date and time of the file handle supplied. + Date and time is in MSDOS format. + */ +-int gettime (file, date, time) ++void gettime (file, date, time) + ZOOFILE file; + unsigned *date, *time; + { +--- a/zoofns.h ++++ b/zoofns.h +@@ -46,7 +46,7 @@ + int exists PARMS ((char *)); + int getfile PARMS ((ZOOFILE, ZOOFILE, long, int)); + int getutime PARMS ((char *, unsigned *, unsigned *)); +-int gettime PARMS ((ZOOFILE, unsigned *, unsigned *)); ++void gettime PARMS ((ZOOFILE, unsigned *, unsigned *)); + T_SIGNAL handle_break PARMS ((int)); + + #ifdef USE_ASCII diff --git a/app-arch/zoo/metadata.xml b/app-arch/zoo/metadata.xml index 85e4ed814fa2..24fb120f7590 100644 --- a/app-arch/zoo/metadata.xml +++ b/app-arch/zoo/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">jduerstock/zoo</remote-id> + </upstream> </pkgmetadata> diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild index 0cda3159c240..e1fad2e5278d 100644 --- a/app-arch/zoo/zoo-2.10-r5.ebuild +++ b/app-arch/zoo/zoo-2.10-r5.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${P}.orig LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" PATCHES=( "${WORKDIR}"/debian/patches/. diff --git a/app-arch/zoo/zoo-2.10-r6.ebuild b/app-arch/zoo/zoo-2.10-r6.ebuild new file mode 100644 index 000000000000..596ed3ada797 --- /dev/null +++ b/app-arch/zoo/zoo-2.10-r6.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Manipulate archives of files in compressed form" +HOMEPAGE="https://github.com/jduerstock/zoo" +SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz + http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}-28.debian.tar.xz" +S="${WORKDIR}"/${P}.orig + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" + +PATCHES=( + "${WORKDIR}"/debian/patches/. + "${FILESDIR}"/${P}-gentoo-fbsd-r1.patch + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-implicit-int.patch +) + +src_configure() { + tc-export CC +} + +src_compile() { + emake linux +} + +src_install() { + dobin zoo fiz + doman zoo.1 fiz.1 +} diff --git a/app-arch/zopfli/zopfli-1.0.3.ebuild b/app-arch/zopfli/zopfli-1.0.3.ebuild index e54b88db2013..d1c897089087 100644 --- a/app-arch/zopfli/zopfli-1.0.3.ebuild +++ b/app-arch/zopfli/zopfli-1.0.3.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake DESCRIPTION="Very good, but slow, deflate or zlib compression" HOMEPAGE="https://github.com/google/zopfli/" SRC_URI="https://github.com/google/zopfli/archive/${P}.tar.gz" - S="${WORKDIR}/${PN}-${P}" LICENSE="Apache-2.0" diff --git a/app-arch/zpaq/zpaq-7.15-r1.ebuild b/app-arch/zpaq/zpaq-7.15-r1.ebuild index cd79e48be432..ac37de18a340 100644 --- a/app-arch/zpaq/zpaq-7.15-r1.ebuild +++ b/app-arch/zpaq/zpaq-7.15-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ S="${WORKDIR}" LICENSE="Unlicense" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="debug +jit" # perl for pod2man diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest index bc52aca1941e..ef1912e82040 100644 --- a/app-arch/zstd/Manifest +++ b/app-arch/zstd/Manifest @@ -1,2 +1,2 @@ -DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133 -DIST zstd-1.5.2.tar.gz 1950967 BLAKE2B 9d474e9fdcf7e5eb09d1f606712b05ca3001e8f6f7451254d8dba3f429101048532fd9c84a5b9083ae90d0457e9e1b1d48256581a1697e7db19b09d73595f070 SHA512 e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e +DIST zstd-1.5.5.tar.gz 2368543 BLAKE2B 7680e27a0adacfb809d9fc81e06d3f99bf74df30374d3b5cb2d58f667dd1b7d5c41697e608592709e17c0e32277f20a6d615edee409b5d7cdcb15da2799a2350 SHA512 99109ec0e07fa65c2101c9cb36be56b672bbd0ee69d265f924718e61f9192ae8385c8d9e4d0c318be9edfa6d849fd3d60e5f164fa120961449429ea3c5dab6b6 +DIST zstd-1.5.6.tar.gz 2406875 BLAKE2B fe17cf0950f8ee2cc07bfa2b41e97f36a1832e396386cb94a55bede975dc974920578cf147b39eecbc5b53ff06fe0dc1fe781a4cab9bc9f767ea28c0e786422e SHA512 54a578f2484da0520a6e9a24f501b9540a3fe3806785d6bc9db79fc095b7c142a7c121387c7eecd460ca71446603584ef1ba4d29a33ca90873338c9ffbd04f14 diff --git a/app-arch/zstd/files/zstd-1.5.4-no-find-valgrind.patch b/app-arch/zstd/files/zstd-1.5.4-no-find-valgrind.patch new file mode 100644 index 000000000000..c52f9dd9c4d6 --- /dev/null +++ b/app-arch/zstd/files/zstd-1.5.4-no-find-valgrind.patch @@ -0,0 +1,12 @@ +Workaround until https://github.com/mesonbuild/meson/pull/11372 lands +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -135,7 +135,7 @@ checkTag = executable('checkTag', + # ============================================================================= + + if tests_supported_oses.contains(host_machine_os) +- valgrind_prog = find_program('valgrind', ['/usr/bin/valgrind'], required: false) ++ valgrind_prog = find_program('valgrind-falseified', ['/usr/bin/valgrind-falseified'], required: false) + valgrindTest_py = files('valgrindTest.py') + if valgrind_prog.found() + test('valgrindTest', diff --git a/app-arch/zstd/zstd-1.4.9.ebuild b/app-arch/zstd/zstd-1.4.9.ebuild deleted file mode 100644 index c815d95ab68c..000000000000 --- a/app-arch/zstd/zstd-1.4.9.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="zstd fast compression library" -HOMEPAGE="https://facebook.github.io/zstd/" -SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="lz4 static-libs +threads" - -RDEPEND="app-arch/xz-utils - lz4? ( app-arch/lz4 )" -DEPEND="${RDEPEND}" - -src_prepare() { - default - multilib_copy_sources - - # Workaround #713940 / https://github.com/facebook/zstd/issues/2045 - # where upstream build system does not add -pthread for Makefile-based - # build system. - use threads && append-flags $(test-flags-CCLD -pthread) -} - -mymake() { - emake \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - "${@}" -} - -multilib_src_compile() { - local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') ) - - mymake -C lib ${libzstd_targets[@]} libzstd.pc - - if multilib_is_native_abi ; then - mymake HAVE_LZ4="$(usex lz4 1 0)" zstd - - mymake -C contrib/pzstd - fi -} - -multilib_src_install() { - mymake -C lib DESTDIR="${D}" install - - if multilib_is_native_abi ; then - mymake -C programs DESTDIR="${D}" install - - mymake -C contrib/pzstd DESTDIR="${D}" install - fi -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs; then - find "${ED}" -name "*.a" -delete || die - fi -} diff --git a/app-arch/zstd/zstd-1.5.2-r3.ebuild b/app-arch/zstd/zstd-1.5.2-r3.ebuild deleted file mode 100644 index 7be94cf2d5f4..000000000000 --- a/app-arch/zstd/zstd-1.5.2-r3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-minimal toolchain-funcs usr-ldscript - -DESCRIPTION="zstd fast compression library" -HOMEPAGE="https://facebook.github.io/zstd/" -SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="lz4 static-libs" - -RDEPEND=" - app-arch/xz-utils - sys-libs/zlib - lz4? ( app-arch/lz4 ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - default - multilib_copy_sources -} - -mymake() { - emake \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - V=1 \ - "${@}" -} - -multilib_src_compile() { - local libzstd_targets=( libzstd{,.a}-mt ) - - mymake -C lib ${libzstd_targets[@]} libzstd.pc - - if multilib_is_native_abi ; then - mymake HAVE_LZ4="$(usex lz4 1 0)" zstd - - mymake -C contrib/pzstd - fi -} - -multilib_src_install() { - mymake -C lib DESTDIR="${D}" install - - if multilib_is_native_abi ; then - mymake -C programs DESTDIR="${D}" install - gen_usr_ldscript -a zstd - - mymake -C contrib/pzstd DESTDIR="${D}" install - fi -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs; then - find "${ED}" -name "*.a" -delete || die - fi -} diff --git a/app-arch/zstd/zstd-1.5.5-r1.ebuild b/app-arch/zstd/zstd-1.5.5-r1.ebuild new file mode 100644 index 000000000000..6e1089f54f9e --- /dev/null +++ b/app-arch/zstd/zstd-1.5.5-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib + +DESCRIPTION="zstd fast compression library" +HOMEPAGE="https://facebook.github.io/zstd/" +SRC_URI="https://github.com/facebook/zstd/releases/download/v${PV}/${P}.tar.gz" +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" +IUSE="+lzma lz4 static-libs test zlib" +RESTRICT="!test? ( test )" + +RDEPEND=" + lzma? ( app-arch/xz-utils ) + lz4? ( app-arch/lz4:= ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" + +MESON_PATCHES=( + # Workaround until Valgrind bugfix lands + "${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch +) + +PATCHES=( +) + +src_prepare() { + cd "${WORKDIR}"/${P} || die + default + + cd "${S}" || die + eapply "${MESON_PATCHES[@]}" +} + +multilib_src_configure() { + local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local + + # This replaces the no-find-valgrind patch once bugfix lands in a meson + # release + we can BDEPEND on it (https://github.com/mesonbuild/meson/pull/11372) + cat >> ${native_file} <<-EOF || die + [binaries] + valgrind='valgrind-falseified' + EOF + + local emesonargs=( + -Ddefault_library=$(multilib_native_usex static-libs both shared) + + $(meson_native_true bin_programs) + $(meson_native_true bin_contrib) + $(meson_use test bin_tests) + + $(meson_native_use_feature zlib) + $(meson_native_use_feature lzma) + $(meson_native_use_feature lz4) + + --native-file "${native_file}" + ) + + meson_src_configure +} diff --git a/app-arch/zstd/zstd-1.5.5.ebuild b/app-arch/zstd/zstd-1.5.5.ebuild new file mode 100644 index 000000000000..b954dd49e2c4 --- /dev/null +++ b/app-arch/zstd/zstd-1.5.5.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib usr-ldscript + +DESCRIPTION="zstd fast compression library" +HOMEPAGE="https://facebook.github.io/zstd/" +SRC_URI="https://github.com/facebook/zstd/releases/download/v${PV}/${P}.tar.gz" +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" +IUSE="+lzma lz4 static-libs test zlib" +RESTRICT="!test? ( test )" + +RDEPEND=" + lzma? ( app-arch/xz-utils ) + lz4? ( app-arch/lz4:= ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" + +MESON_PATCHES=( + # Workaround until Valgrind bugfix lands + "${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch +) + +PATCHES=( +) + +src_prepare() { + cd "${WORKDIR}"/${P} || die + default + + cd "${S}" || die + eapply "${MESON_PATCHES[@]}" +} + +multilib_src_configure() { + local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local + + # This replaces the no-find-valgrind patch once bugfix lands in a meson + # release + we can BDEPEND on it (https://github.com/mesonbuild/meson/pull/11372) + cat >> ${native_file} <<-EOF || die + [binaries] + valgrind='valgrind-falseified' + EOF + + local emesonargs=( + -Ddefault_library=$(multilib_native_usex static-libs both shared) + + $(meson_native_true bin_programs) + $(meson_native_true bin_contrib) + $(meson_use test bin_tests) + + $(meson_native_use_feature zlib) + $(meson_native_use_feature lzma) + $(meson_native_use_feature lz4) + + --native-file "${native_file}" + ) + + meson_src_configure +} + +multilib_src_install() { + meson_src_install + + multilib_is_native_abi && gen_usr_ldscript -a zstd +} diff --git a/app-arch/zstd/zstd-1.5.6.ebuild b/app-arch/zstd/zstd-1.5.6.ebuild new file mode 100644 index 000000000000..0b0fac3c180d --- /dev/null +++ b/app-arch/zstd/zstd-1.5.6.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib + +DESCRIPTION="zstd fast compression library" +HOMEPAGE="https://facebook.github.io/zstd/" +SRC_URI="https://github.com/facebook/zstd/releases/download/v${PV}/${P}.tar.gz" +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" +IUSE="+lzma lz4 static-libs test zlib" +RESTRICT="!test? ( test )" + +RDEPEND=" + lzma? ( app-arch/xz-utils ) + lz4? ( app-arch/lz4:= ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" + +MESON_PATCHES=( + # Workaround until Valgrind bugfix lands + "${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch +) + +PATCHES=( +) + +src_prepare() { + cd "${WORKDIR}"/${P} || die + default + + cd "${S}" || die + eapply "${MESON_PATCHES[@]}" +} + +multilib_src_configure() { + local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local + + # This replaces the no-find-valgrind patch once bugfix lands in a meson + # release + we can BDEPEND on it (https://github.com/mesonbuild/meson/pull/11372) + cat >> ${native_file} <<-EOF || die + [binaries] + valgrind='valgrind-falseified' + EOF + + local emesonargs=( + -Ddefault_library=$(multilib_native_usex static-libs both shared) + + $(meson_native_true bin_programs) + $(meson_native_true bin_contrib) + $(meson_use test bin_tests) + + $(meson_native_use_feature zlib) + $(meson_native_use_feature lzma) + $(meson_native_use_feature lz4) + + --native-file "${native_file}" + ) + + meson_src_configure +} |