subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-arch\/7zip\/"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2026-02-24 Thread Arthur Zamarin

commit: 402c1a598514f09c6980507d8b9f91f75994c98e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Feb 24 16:51:46 2026 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Feb 24 17:03:15 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402c1a59

app-arch/7zip: add 26.00

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-26.00.ebuild | 118 
 app-arch/7zip/Manifest  |   2 +
 2 files changed, 120 insertions(+)

diff --git a/app-arch/7zip/7zip-26.00.ebuild b/app-arch/7zip/7zip-26.00.ebuild
new file mode 100644
index ..03e5739bc5b4
--- /dev/null
+++ b/app-arch/7zip/7zip-26.00.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2023-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix flag-o-matic toolchain-funcs
+
+NO_DOT_PV=$(ver_rs 1- '')
+DESCRIPTION="Free file archiver for extremely high compression"
+HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
+# linux-x64 tarball is only used for docs
+SRC_URI="
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
+"
+S="${WORKDIR}"
+
+LICENSE="LGPL-2 BSD rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+IUSE="uasm jwasm rar +symlink"
+REQUIRED_USE="?? ( uasm jwasm )"
+
+DOCS=( readme.txt History.txt License.txt )
+HTML_DOCS=( MANUAL )
+
+BDEPEND="
+   app-arch/xz-utils[extra-filters(+)]
+   uasm? ( dev-lang/uasm )
+   jwasm? ( dev-lang/jwasm )
+"
+RDEPEND="
+   symlink? ( !app-arch/p7zip )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-24.05-respect-build-env.patch"
+)
+
+# TODO(NRK): also build and install the library
+# TODO(NRK): make it so this package can be used as a drop-in replacement
+# for app-arch/p7zip ??
+
+pkg_setup() {
+   # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
+   # TLDR; every combination of options (clang|gcc)+(asm/noasm)
+   # has a dedicated makefile & builddir
+   mfile="cmpl"
+   if tc-is-clang; then
+   mfile="${mfile}_clang"
+   bdir=c
+   elif tc-is-gcc; then
+   mfile="${mfile}_gcc"
+   bdir=g
+   else
+   die "Unsupported compiler: $(tc-getCC)"
+   fi
+   if use jwasm || use uasm ; then
+   mfile="${mfile}_x64"
+   bdir="${bdir}_x64"
+   fi
+   export mfile="${mfile}.mak"
+   export bdir
+}
+
+src_prepare() {
+   # patch doesn't deal with CRLF even if file+patch match
+   # not even with --ignore-whitespace, --binary or --force
+   pushd "./CPP/7zip" || die "Unable to switch directory"
+   edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
+   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
+   popd >/dev/null || die "Unable to switch directory"
+
+   default
+}
+
+src_compile() {
+   pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
+
+   # avoid executable stack when using uasm/jwasm, harmless otherwise
+   append-ldflags -Wl,-z,noexecstack
+   export G_CFLAGS=${CFLAGS}
+   export G_CXXFLAGS=${CXXFLAGS}
+   export G_LDFLAGS=${LDFLAGS}
+
+   local args=(
+   -f "../../${mfile}"
+   CC=$(tc-getCC)
+   CXX=$(tc-getCXX)
+   )
+   # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
+   # whether it's defined or not. so in case user has `rar` enabled
+   # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
+   if ! use rar; then
+   # disables non-free rar code but allows listing and extracting
+   # non-compressed rar archives
+   args+=( DISABLE_RAR_COMPRESS=1 )
+   fi
+   if use jwasm; then
+   args+=( USE_JWASM=1 )
+   elif use uasm; then
+   args+=( MY_ASM=uasm )
+   fi
+
+   mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
+   emake ${args[@]}
+   popd > /dev/null || die "Unable to switch directory"
+}
+
+src_install() {
+   dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
+   if use symlink; then
+   dosym 7zz /usr/bin/7z
+   dosym 7zz /usr/bin/7za
+   dosym 7zz /usr/bin/7zr
+   fi
+   einstalldocs
+}

diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
index 34f8e0217e09..b169e498e2fa 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -1,2 +1,4 @@
 DIST 7z2501-linux-x64.tar.xz 1571044 BLAKE2B 
ec260b50da5781ad547cbb506bc8ab51250acdfa63ca0b03ad43c4ae475ea181f4b102959cf4470943e43d910f97eb29c387af3512b80ecbcf43535d99f22e09
 SHA512 
3f80196dd053456993e5f6585768b863b8c06a77e3c14c61b818ef8cedfbf07c

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-12-11 Thread WANG Xuerui

commit: d88bbd6c585f4f2d853850572dfe8544d48199a0
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu Dec 11 10:00:06 2025 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu Dec 11 10:00:40 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88bbd6c

app-arch/7zip: keyword 25.01 for ~loong, #953098

Signed-off-by: WANG Xuerui  gentoo.org>

 app-arch/7zip/7zip-25.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-25.01.ebuild b/app-arch/7zip/7zip-25.01.ebuild
index 50aae50e9ba3..25f52af4bab6 100644
--- a/app-arch/7zip/7zip-25.01.ebuild
+++ b/app-arch/7zip/7zip-25.01.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc 
x86"
 IUSE="uasm jwasm rar +symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-09-24 Thread Sam James

commit: 09aaf0a129b97f8dab6514cfc934d404f8384709
Author: Z. Liu  gmail  com>
AuthorDate: Wed Sep 24 09:03:27 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 24 19:37:54 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09aaf0a1

app-arch/7zip: add github upstream metadata

https://www.7-zip.org/links.html

Signed-off-by: Z. Liu  gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43923
Closes: https://github.com/gentoo/gentoo/pull/43923
Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-arch/7zip/metadata.xml b/app-arch/7zip/metadata.xml
index 7b915af55709..0198c045f568 100644
--- a/app-arch/7zip/metadata.xml
+++ b/app-arch/7zip/metadata.xml
@@ -24,6 +24,7 @@

sevenzip
cpe:/a:7-zip:7-zip
+   ip7z/7zip
https://www.7-zip.org/history.txt
https://sourceforge.net/p/sevenzip/bugs/

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-08-10 Thread Arthur Zamarin

commit: f0b64b1cbe03b5e94a69a3b0b01f44d475749666
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 10 07:59:41 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 10 07:59:41 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b64b1c

app-arch/7zip: drop 24.09, 25.00 [SECURITY]

Bug: https://bugs.gentoo.org/961281
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.09.ebuild | 118 
 app-arch/7zip/7zip-25.00.ebuild | 118 
 app-arch/7zip/Manifest  |   4 --
 3 files changed, 240 deletions(-)

diff --git a/app-arch/7zip/7zip-24.09.ebuild b/app-arch/7zip/7zip-24.09.ebuild
deleted file mode 100644
index 8b0d49535275..
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edos2unix flag-o-matic toolchain-funcs
-
-NO_DOT_PV=$(ver_rs 1- '')
-DESCRIPTION="Free file archiver for extremely high compression"
-HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
-# linux-x64 tarball is only used for docs
-SRC_URI="
-   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
-   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
-"
-S="${WORKDIR}"
-
-LICENSE="LGPL-2 BSD rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="uasm jwasm rar symlink"
-REQUIRED_USE="?? ( uasm jwasm )"
-
-DOCS=( readme.txt History.txt License.txt )
-HTML_DOCS=( MANUAL )
-
-BDEPEND="
-   app-arch/xz-utils[extra-filters(+)]
-   uasm? ( dev-lang/uasm )
-   jwasm? ( dev-lang/jwasm )
-"
-RDEPEND="
-   symlink? ( !app-arch/p7zip )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-24.05-respect-build-env.patch"
-)
-
-# TODO(NRK): also build and install the library
-# TODO(NRK): make it so this package can be used as a drop-in replacement
-# for app-arch/p7zip ??
-
-pkg_setup() {
-   # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
-   # TLDR; every combination of options (clang|gcc)+(asm/noasm)
-   # has a dedicated makefile & builddir
-   mfile="cmpl"
-   if tc-is-clang; then
-   mfile="${mfile}_clang"
-   bdir=c
-   elif tc-is-gcc; then
-   mfile="${mfile}_gcc"
-   bdir=g
-   else
-   die "Unsupported compiler: $(tc-getCC)"
-   fi
-   if use jwasm || use uasm ; then
-   mfile="${mfile}_x64"
-   bdir="${bdir}_x64"
-   fi
-   export mfile="${mfile}.mak"
-   export bdir
-}
-
-src_prepare() {
-   # patch doesn't deal with CRLF even if file+patch match
-   # not even with --ignore-whitespace, --binary or --force
-   pushd "./CPP/7zip" || die "Unable to switch directory"
-   edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
-   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
-   popd >/dev/null || die "Unable to switch directory"
-
-   default
-}
-
-src_compile() {
-   pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
-
-   # avoid executable stack when using uasm/jwasm, harmless otherwise
-   append-ldflags -Wl,-z,noexecstack
-   export G_CFLAGS=${CFLAGS}
-   export G_CXXFLAGS=${CXXFLAGS}
-   export G_LDFLAGS=${LDFLAGS}
-
-   local args=(
-   -f "../../${mfile}"
-   CC=$(tc-getCC)
-   CXX=$(tc-getCXX)
-   )
-   # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
-   # whether it's defined or not. so in case user has `rar` enabled
-   # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
-   if ! use rar; then
-   # disables non-free rar code but allows listing and extracting
-   # non-compressed rar archives
-   args+=( DISABLE_RAR_COMPRESS=1 )
-   fi
-   if use jwasm; then
-   args+=( USE_JWASM=1 )
-   elif use uasm; then
-   args+=( MY_ASM=uasm )
-   fi
-
-   mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
-   emake ${args[@]}
-   popd > /dev/null || die "Unable to switch directory"
-}
-
-src_install() {
-   dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
-   if use symlink; then
-   dosym 7zz /usr/bin/7z
-   dosym 7zz /usr/bin/7za
-   dosym 7zz /usr/bin/7zr
-   fi
-   einstalldocs
-}

diff --git a/app-arch/7zip/7zip-25.00.ebuild b/app-arch/7zip/7zip-25.00.ebuild
deleted file mode 100644
index 50aae50e9ba3..
--- a/app-arch/7zip/7zip-25.00.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Pu

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-08-10 Thread Sam James

commit: f64b3439a3b246bc8c7f755c843c6837286b954a
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 10 07:58:26 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 10 07:58:26 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f64b3439

app-arch/7zip: Stabilize 25.01 arm64, #961285

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-25.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-25.01.ebuild b/app-arch/7zip/7zip-25.01.ebuild
index 0692452e3f62..50aae50e9ba3 100644
--- a/app-arch/7zip/7zip-25.01.ebuild
+++ b/app-arch/7zip/7zip-25.01.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="uasm jwasm rar +symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-08-10 Thread Arthur Zamarin

commit: a17b478c47672f7c7c7c005de9af32677021143f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 10 07:57:21 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 10 07:57:21 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a17b478c

app-arch/7zip: Stabilize 25.01 amd64, #961285

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-25.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-25.01.ebuild b/app-arch/7zip/7zip-25.01.ebuild
index 7fc662ee9568..a00992ac8087 100644
--- a/app-arch/7zip/7zip-25.01.ebuild
+++ b/app-arch/7zip/7zip-25.01.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="uasm jwasm rar +symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-08-10 Thread Arthur Zamarin

commit: 6bdc6fd9b831f9a3ad0a2d3a0b78afffa4ade008
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 10 07:57:22 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 10 07:57:22 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bdc6fd9

app-arch/7zip: Stabilize 25.01 x86, #961285

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-25.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-25.01.ebuild b/app-arch/7zip/7zip-25.01.ebuild
index a00992ac8087..0692452e3f62 100644
--- a/app-arch/7zip/7zip-25.01.ebuild
+++ b/app-arch/7zip/7zip-25.01.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="uasm jwasm rar +symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-08-06 Thread Arthur Zamarin

commit: 227192b52d91f7167e2ce8e22d54bcbacfc24162
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Aug  6 17:26:08 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Aug  6 17:26:08 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=227192b5

app-arch/7zip: add 25.01

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-25.01.ebuild | 118 
 app-arch/7zip/Manifest  |   2 +
 2 files changed, 120 insertions(+)

diff --git a/app-arch/7zip/7zip-25.01.ebuild b/app-arch/7zip/7zip-25.01.ebuild
new file mode 100644
index ..7fc662ee9568
--- /dev/null
+++ b/app-arch/7zip/7zip-25.01.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix flag-o-matic toolchain-funcs
+
+NO_DOT_PV=$(ver_rs 1- '')
+DESCRIPTION="Free file archiver for extremely high compression"
+HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
+# linux-x64 tarball is only used for docs
+SRC_URI="
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
+"
+S="${WORKDIR}"
+
+LICENSE="LGPL-2 BSD rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="uasm jwasm rar +symlink"
+REQUIRED_USE="?? ( uasm jwasm )"
+
+DOCS=( readme.txt History.txt License.txt )
+HTML_DOCS=( MANUAL )
+
+BDEPEND="
+   app-arch/xz-utils[extra-filters(+)]
+   uasm? ( dev-lang/uasm )
+   jwasm? ( dev-lang/jwasm )
+"
+RDEPEND="
+   symlink? ( !app-arch/p7zip )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-24.05-respect-build-env.patch"
+)
+
+# TODO(NRK): also build and install the library
+# TODO(NRK): make it so this package can be used as a drop-in replacement
+# for app-arch/p7zip ??
+
+pkg_setup() {
+   # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
+   # TLDR; every combination of options (clang|gcc)+(asm/noasm)
+   # has a dedicated makefile & builddir
+   mfile="cmpl"
+   if tc-is-clang; then
+   mfile="${mfile}_clang"
+   bdir=c
+   elif tc-is-gcc; then
+   mfile="${mfile}_gcc"
+   bdir=g
+   else
+   die "Unsupported compiler: $(tc-getCC)"
+   fi
+   if use jwasm || use uasm ; then
+   mfile="${mfile}_x64"
+   bdir="${bdir}_x64"
+   fi
+   export mfile="${mfile}.mak"
+   export bdir
+}
+
+src_prepare() {
+   # patch doesn't deal with CRLF even if file+patch match
+   # not even with --ignore-whitespace, --binary or --force
+   pushd "./CPP/7zip" || die "Unable to switch directory"
+   edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
+   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
+   popd >/dev/null || die "Unable to switch directory"
+
+   default
+}
+
+src_compile() {
+   pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
+
+   # avoid executable stack when using uasm/jwasm, harmless otherwise
+   append-ldflags -Wl,-z,noexecstack
+   export G_CFLAGS=${CFLAGS}
+   export G_CXXFLAGS=${CXXFLAGS}
+   export G_LDFLAGS=${LDFLAGS}
+
+   local args=(
+   -f "../../${mfile}"
+   CC=$(tc-getCC)
+   CXX=$(tc-getCXX)
+   )
+   # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
+   # whether it's defined or not. so in case user has `rar` enabled
+   # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
+   if ! use rar; then
+   # disables non-free rar code but allows listing and extracting
+   # non-compressed rar archives
+   args+=( DISABLE_RAR_COMPRESS=1 )
+   fi
+   if use jwasm; then
+   args+=( USE_JWASM=1 )
+   elif use uasm; then
+   args+=( MY_ASM=uasm )
+   fi
+
+   mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
+   emake ${args[@]}
+   popd > /dev/null || die "Unable to switch directory"
+}
+
+src_install() {
+   dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
+   if use symlink; then
+   dosym 7zz /usr/bin/7z
+   dosym 7zz /usr/bin/7za
+   dosym 7zz /usr/bin/7zr
+   fi
+   einstalldocs
+}

diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
index a2bfd6eed151..0b4e11cf0700 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -2,3 +2,5 @@ DIST 7z2409-linux-x64.tar.xz 1565344 BLAKE2B 
4ded059fe85073405b4a1510378ed473bca
 DIST 7z2409-src.tar.xz 1511288 BLAKE2B 
5fcb39acc282b7dafbd1900eaf77e15e634adda5eff5d630b9d0821aa0d1e8569856cf99503ab7ffe69a82cec82a1a890772d6cff86cdb0af01dd462a94c0908
 SHA5

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-07-25 Thread Sam James

commit: cfdf295a211dcaf0aa336a1022a1b2784ab9e73e
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 25 23:40:57 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 25 23:41:17 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfdf295a

app-arch/7zip: Stabilize 25.00 amd64, #960635

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-25.00.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-25.00.ebuild b/app-arch/7zip/7zip-25.00.ebuild
index 5ae6115b9439..50aae50e9ba3 100644
--- a/app-arch/7zip/7zip-25.00.ebuild
+++ b/app-arch/7zip/7zip-25.00.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="uasm jwasm rar +symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-07-24 Thread Sam James

commit: b247c4f3f5aa46881af6bb47c854833289f013c4
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 24 22:56:09 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 24 22:56:09 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b247c4f3

app-arch/7zip: Stabilize 25.00 arm64, #960635

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-25.00.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-25.00.ebuild b/app-arch/7zip/7zip-25.00.ebuild
index f103cd5cf4a9..5ae6115b9439 100644
--- a/app-arch/7zip/7zip-25.00.ebuild
+++ b/app-arch/7zip/7zip-25.00.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="uasm jwasm rar +symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-07-24 Thread Sam James

commit: 6ed7da5297f0bbd1f466a010063f86d829d4aac2
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 24 21:27:31 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 24 21:27:31 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ed7da52

app-arch/7zip: Stabilize 25.00 x86, #960635

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-25.00.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-25.00.ebuild b/app-arch/7zip/7zip-25.00.ebuild
index 7fc662ee9568..f103cd5cf4a9 100644
--- a/app-arch/7zip/7zip-25.00.ebuild
+++ b/app-arch/7zip/7zip-25.00.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="uasm jwasm rar +symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-07-05 Thread Arthur Zamarin

commit: c12c583274869e07d1c57cb4ba66ff6da16b75ca
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jul  6 04:19:07 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jul  6 04:19:07 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c12c5832

app-arch/7zip: add cpe upstream metadata

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-arch/7zip/metadata.xml b/app-arch/7zip/metadata.xml
index 277fdcfd9104..7b915af55709 100644
--- a/app-arch/7zip/metadata.xml
+++ b/app-arch/7zip/metadata.xml
@@ -23,6 +23,7 @@
Igor Pavlov

sevenzip
+   cpe:/a:7-zip:7-zip
https://www.7-zip.org/history.txt
https://sourceforge.net/p/sevenzip/bugs/

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-07-05 Thread Arthur Zamarin

commit: 6a045406da9b19b02e32c4cceb6b83b0c97f8540
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jul  6 04:14:27 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jul  6 04:14:27 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a045406

app-arch/7zip: drop 24.08

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.08.ebuild | 111 
 app-arch/7zip/Manifest  |   2 -
 2 files changed, 113 deletions(-)

diff --git a/app-arch/7zip/7zip-24.08.ebuild b/app-arch/7zip/7zip-24.08.ebuild
deleted file mode 100644
index e7a0ad11d26b..
--- a/app-arch/7zip/7zip-24.08.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edos2unix flag-o-matic toolchain-funcs
-
-NO_DOT_PV=$(ver_rs 1- '')
-DESCRIPTION="Free file archiver for extremely high compression"
-HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
-# linux-x64 tarball is only used for docs
-SRC_URI="
-   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
-   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
-"
-S="${WORKDIR}"
-
-LICENSE="LGPL-2 BSD rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~riscv"
-IUSE="uasm jwasm rar"
-REQUIRED_USE="?? ( uasm jwasm )"
-
-DOCS=( readme.txt History.txt License.txt )
-HTML_DOCS=( MANUAL )
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-   app-arch/xz-utils[extra-filters(+)]
-   uasm? ( dev-lang/uasm )
-   jwasm? ( dev-lang/jwasm )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-24.05-respect-build-env.patch"
-)
-
-# TODO(NRK): also build and install the library
-# TODO(NRK): make it so this package can be used as a drop-in replacement
-# for app-arch/p7zip ??
-
-pkg_setup() {
-   # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
-   # TLDR; every combination of options (clang|gcc)+(asm/noasm)
-   # has a dedicated makefile & builddir
-   mfile="cmpl"
-   if tc-is-clang; then
-   mfile="${mfile}_clang"
-   bdir=c
-   elif tc-is-gcc; then
-   mfile="${mfile}_gcc"
-   bdir=g
-   else
-   die "Unsupported compiler: $(tc-getCC)"
-   fi
-   if use jwasm || use uasm ; then
-   mfile="${mfile}_x64"
-   bdir="${bdir}_x64"
-   fi
-   export mfile="${mfile}.mak"
-   export bdir
-}
-
-src_prepare() {
-   # patch doesn't deal with CRLF even if file+patch match
-   # not even with --ignore-whitespace, --binary or --force
-   pushd "./CPP/7zip" || die "Unable to switch directory"
-   edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
-   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
-   popd >/dev/null || die "Unable to switch directory"
-
-   default
-}
-
-src_compile() {
-   pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
-
-   # avoid executable stack when using uasm/jwasm, harmless otherwise
-   append-ldflags -Wl,-z,noexecstack
-   export G_CFLAGS=${CFLAGS}
-   export G_CXXFLAGS=${CXXFLAGS}
-   export G_LDFLAGS=${LDFLAGS}
-
-   local args=(
-   -f "../../${mfile}"
-   CC=$(tc-getCC)
-   CXX=$(tc-getCXX)
-   )
-   # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
-   # whether it's defined or not. so in case user has `rar` enabled
-   # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
-   if ! use rar; then
-   # disables non-free rar code but allows listing and extracting
-   # non-compressed rar archives
-   args+=( DISABLE_RAR_COMPRESS=1 )
-   fi
-   if use jwasm; then
-   args+=( USE_JWASM=1 )
-   elif use uasm; then
-   args+=( MY_ASM=uasm )
-   fi
-
-   mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
-   emake ${args[@]}
-   popd > /dev/null || die "Unable to switch directory"
-}
-
-src_install() {
-   dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
-   einstalldocs
-}

diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
index 2f691fbc211c..a2bfd6eed151 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -1,5 +1,3 @@
-DIST 7z2408-linux-x64.tar.xz 1556956 BLAKE2B 
177b355830201e48d314667c1936e3ca0b624b3fd47b8696df78cc27bb559fd239c1ab2146a88111c3bd1ef1396e694d235babb9b8391fc55cac89c97d7990bd
 SHA512 
00b8d2b89e1410e360cf034c44a43cb88927d76317ee291519ef1f39e3cab68b5549de66f0f6b867f0367d50e7661f484e0a0f7afdd2ecb963804e44c789d7ce
-DIST 7z2408-src.tar.xz 1493700 BLAKE2B 
fd22a302044ca8655187573173fdc13ae93efaf907cb60076600013e3f463912b876cc3764853ce9d1850fc10dc264cd96917ef6dca9332541db292aee3f1ab4
 S

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-07-05 Thread Arthur Zamarin

commit: 5b8bfcabe121239494b2b23c7bb1eaa2f9c5885b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jul  6 04:11:21 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jul  6 04:11:49 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8bfcab

app-arch/7zip: add 25.00, make [symlink] default

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-25.00.ebuild | 118 
 app-arch/7zip/Manifest  |   2 +
 2 files changed, 120 insertions(+)

diff --git a/app-arch/7zip/7zip-25.00.ebuild b/app-arch/7zip/7zip-25.00.ebuild
new file mode 100644
index ..7fc662ee9568
--- /dev/null
+++ b/app-arch/7zip/7zip-25.00.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix flag-o-matic toolchain-funcs
+
+NO_DOT_PV=$(ver_rs 1- '')
+DESCRIPTION="Free file archiver for extremely high compression"
+HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
+# linux-x64 tarball is only used for docs
+SRC_URI="
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
+"
+S="${WORKDIR}"
+
+LICENSE="LGPL-2 BSD rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="uasm jwasm rar +symlink"
+REQUIRED_USE="?? ( uasm jwasm )"
+
+DOCS=( readme.txt History.txt License.txt )
+HTML_DOCS=( MANUAL )
+
+BDEPEND="
+   app-arch/xz-utils[extra-filters(+)]
+   uasm? ( dev-lang/uasm )
+   jwasm? ( dev-lang/jwasm )
+"
+RDEPEND="
+   symlink? ( !app-arch/p7zip )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-24.05-respect-build-env.patch"
+)
+
+# TODO(NRK): also build and install the library
+# TODO(NRK): make it so this package can be used as a drop-in replacement
+# for app-arch/p7zip ??
+
+pkg_setup() {
+   # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
+   # TLDR; every combination of options (clang|gcc)+(asm/noasm)
+   # has a dedicated makefile & builddir
+   mfile="cmpl"
+   if tc-is-clang; then
+   mfile="${mfile}_clang"
+   bdir=c
+   elif tc-is-gcc; then
+   mfile="${mfile}_gcc"
+   bdir=g
+   else
+   die "Unsupported compiler: $(tc-getCC)"
+   fi
+   if use jwasm || use uasm ; then
+   mfile="${mfile}_x64"
+   bdir="${bdir}_x64"
+   fi
+   export mfile="${mfile}.mak"
+   export bdir
+}
+
+src_prepare() {
+   # patch doesn't deal with CRLF even if file+patch match
+   # not even with --ignore-whitespace, --binary or --force
+   pushd "./CPP/7zip" || die "Unable to switch directory"
+   edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
+   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
+   popd >/dev/null || die "Unable to switch directory"
+
+   default
+}
+
+src_compile() {
+   pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
+
+   # avoid executable stack when using uasm/jwasm, harmless otherwise
+   append-ldflags -Wl,-z,noexecstack
+   export G_CFLAGS=${CFLAGS}
+   export G_CXXFLAGS=${CXXFLAGS}
+   export G_LDFLAGS=${LDFLAGS}
+
+   local args=(
+   -f "../../${mfile}"
+   CC=$(tc-getCC)
+   CXX=$(tc-getCXX)
+   )
+   # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
+   # whether it's defined or not. so in case user has `rar` enabled
+   # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
+   if ! use rar; then
+   # disables non-free rar code but allows listing and extracting
+   # non-compressed rar archives
+   args+=( DISABLE_RAR_COMPRESS=1 )
+   fi
+   if use jwasm; then
+   args+=( USE_JWASM=1 )
+   elif use uasm; then
+   args+=( MY_ASM=uasm )
+   fi
+
+   mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
+   emake ${args[@]}
+   popd > /dev/null || die "Unable to switch directory"
+}
+
+src_install() {
+   dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
+   if use symlink; then
+   dosym 7zz /usr/bin/7z
+   dosym 7zz /usr/bin/7za
+   dosym 7zz /usr/bin/7zr
+   fi
+   einstalldocs
+}

diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
index b551b3c3e9cd..2f691fbc211c 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -2,3 +2,5 @@ DIST 7z2408-linux-x64.tar.xz 1556956 BLAKE2B 
177b355830201e48d314667c1936e3ca0b6
 DIST 7z2408-src.tar.xz 1493700 BLAKE2B 
fd22a302044ca8655187573173fdc13ae93efaf907cb60076600013e3f463912b876cc3764853ce9d1850fc10dc264cd96917ef6dca933

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-06-07 Thread Sam James

commit: d23af16f0443b8e97cf50fc4724e4b987287d106
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  7 14:44:34 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  7 14:44:58 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d23af16f

app-arch/7zip: Keyword 24.09 s390, #953098

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-24.09.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.09.ebuild b/app-arch/7zip/7zip-24.09.ebuild
index b7c954fc907a..8b0d49535275 100644
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ b/app-arch/7zip/7zip-24.09.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="uasm jwasm rar symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-05-16 Thread Arthur Zamarin

commit: bbfc1365fc113e0e837c5e313aa4b1ff4f0441c0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May 16 15:14:56 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May 16 15:14:56 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbfc1365

app-arch/7zip: Keyword 24.09 alpha, #953098

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.09.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.09.ebuild b/app-arch/7zip/7zip-24.09.ebuild
index b54802917082..b7c954fc907a 100644
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ b/app-arch/7zip/7zip-24.09.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="uasm jwasm rar symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-04-15 Thread Arthur Zamarin

commit: d1bfb54ba578ef2990cf484d54d1f7cddc373bef
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Apr 15 18:54:54 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 15 18:54:54 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1bfb54b

app-arch/7zip: Stabilize 24.09 x86, #953858

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.09.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.09.ebuild b/app-arch/7zip/7zip-24.09.ebuild
index 17b3d2c964ba..b54802917082 100644
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ b/app-arch/7zip/7zip-24.09.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="uasm jwasm rar symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-04-09 Thread Sam James

commit: 01a48b94ccc05b778193f31e6b9a95945fce23d7
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 10 06:46:48 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 10 06:46:48 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01a48b94

app-arch/7zip: Keyword 24.09 hppa, #953098

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-24.09.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.09.ebuild b/app-arch/7zip/7zip-24.09.ebuild
index 734a43219891..17b3d2c964ba 100644
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ b/app-arch/7zip/7zip-24.09.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="uasm jwasm rar symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-04-04 Thread Arthur Zamarin

commit: e201bc4e4c30dcf527b08e48132c5513a55b9131
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr  5 04:36:10 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr  5 04:36:10 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e201bc4e

app-arch/7zip: Keyword 24.09 x86, #953098

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.09.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.09.ebuild b/app-arch/7zip/7zip-24.09.ebuild
index 455c48118c54..734a43219891 100644
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ b/app-arch/7zip/7zip-24.09.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="uasm jwasm rar symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-04-03 Thread Sam James

commit: d29afc83e30b2326efa3e7669d2c8a9ae2eb958e
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr  3 20:57:04 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  3 20:57:04 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d29afc83

app-arch/7zip: Keyword 24.09 sparc, #953098

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-24.09.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.09.ebuild b/app-arch/7zip/7zip-24.09.ebuild
index f5c238c4c2b9..455c48118c54 100644
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ b/app-arch/7zip/7zip-24.09.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc"
 IUSE="uasm jwasm rar symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-04-03 Thread Sam James

commit: d87af47d3acde7dccea6b100ae1c45fbef13
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr  3 20:40:13 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  3 20:40:13 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d87af47d

app-arch/7zip: Keyword 24.09 arm, #953098

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-24.09.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.09.ebuild b/app-arch/7zip/7zip-24.09.ebuild
index 255f34e19905..f5c238c4c2b9 100644
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ b/app-arch/7zip/7zip-24.09.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv"
 IUSE="uasm jwasm rar symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-03-23 Thread Sam James

commit: 4dc57a07f0cc2d8df95d63ce7c6244f68efada64
Author: NRK  disroot  org>
AuthorDate: Fri Mar 14 17:05:07 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 24 06:52:55 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dc57a07

app-arch/7zip: add symlink useflag

goal is to allow packages which only use the 7z/7zr/7za binaries
to be able to depend on 7zip[symlink] rather than p7zip. this is
a step towards replacing the unmaintained p7zip.

Bug: https://bugs.gentoo.org/942397
Signed-off-by: NRK  disroot.org>
Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-24.09.ebuild | 11 +--
 app-arch/7zip/metadata.xml  |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-arch/7zip/7zip-24.09.ebuild b/app-arch/7zip/7zip-24.09.ebuild
index dee12baa0394..255f34e19905 100644
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ b/app-arch/7zip/7zip-24.09.ebuild
@@ -18,18 +18,20 @@ S="${WORKDIR}"
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
 KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~riscv"
-IUSE="uasm jwasm rar"
+IUSE="uasm jwasm rar symlink"
 REQUIRED_USE="?? ( uasm jwasm )"
 
 DOCS=( readme.txt History.txt License.txt )
 HTML_DOCS=( MANUAL )
 
-DEPEND="${RDEPEND}"
 BDEPEND="
app-arch/xz-utils[extra-filters(+)]
uasm? ( dev-lang/uasm )
jwasm? ( dev-lang/jwasm )
 "
+RDEPEND="
+   symlink? ( !app-arch/p7zip )
+"
 
 PATCHES=(
"${FILESDIR}/${PN}-24.05-respect-build-env.patch"
@@ -107,5 +109,10 @@ src_compile() {
 
 src_install() {
dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
+   if use symlink; then
+   dosym 7zz /usr/bin/7z
+   dosym 7zz /usr/bin/7za
+   dosym 7zz /usr/bin/7zr
+   fi
einstalldocs
 }

diff --git a/app-arch/7zip/metadata.xml b/app-arch/7zip/metadata.xml
index 772c93a14f12..277fdcfd9104 100644
--- a/app-arch/7zip/metadata.xml
+++ b/app-arch/7zip/metadata.xml
@@ -16,6 +16,7 @@
Enable support for non-free rar decoder
Use dev-lang/uasm to include 
optimized code
Use dev-lang/jwasm to include 
optimized code (doesn't support AES)
+   Install additional symlink to 7z, 7za and 
7zr

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-01-08 Thread Sam James

commit: bb5b5b276fdb1d13d4de8f7b49e632d88811fc1a
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  8 20:43:32 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  8 20:43:32 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb5b5b27

app-arch/7zip: Stabilize 24.09 amd64, #947734

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-24.09.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/7zip/7zip-24.09.ebuild b/app-arch/7zip/7zip-24.09.ebuild
index 65deea631e60..733cf8590147 100644
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ b/app-arch/7zip/7zip-24.09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv"
 IUSE="uasm jwasm rar"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2025-01-08 Thread Sam James

commit: 0ba8661153d96cca722ffecaf4f5fc85cf974067
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  8 20:43:33 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  8 20:43:33 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba86611

app-arch/7zip: Stabilize 24.09 arm64, #947734

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-24.09.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.09.ebuild b/app-arch/7zip/7zip-24.09.ebuild
index 733cf8590147..dee12baa0394 100644
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ b/app-arch/7zip/7zip-24.09.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~riscv"
 IUSE="uasm jwasm rar"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-12-06 Thread Arthur Zamarin

commit: 1c4b1f3d63c8aff037f083943330b1639913b9ae
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  6 19:20:29 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  6 19:44:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c4b1f3d

app-arch/7zip: drop 24.07

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.07.ebuild | 111 
 app-arch/7zip/Manifest  |   2 -
 2 files changed, 113 deletions(-)

diff --git a/app-arch/7zip/7zip-24.07.ebuild b/app-arch/7zip/7zip-24.07.ebuild
deleted file mode 100644
index 863cdc56fe57..
--- a/app-arch/7zip/7zip-24.07.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edos2unix flag-o-matic toolchain-funcs
-
-NO_DOT_PV=$(ver_rs 1- '')
-DESCRIPTION="Free file archiver for extremely high compression"
-HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
-# linux-x64 tarball is only used for docs
-SRC_URI="
-   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
-   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
-"
-S="${WORKDIR}"
-
-LICENSE="LGPL-2 BSD rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE="uasm jwasm rar"
-REQUIRED_USE="?? ( uasm jwasm )"
-
-DOCS=( readme.txt History.txt License.txt )
-HTML_DOCS=( MANUAL )
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-   app-arch/xz-utils[extra-filters(+)]
-   uasm? ( dev-lang/uasm )
-   jwasm? ( dev-lang/jwasm )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-24.05-respect-build-env.patch"
-)
-
-# TODO(NRK): also build and install the library
-# TODO(NRK): make it so this package can be used as a drop-in replacement
-# for app-arch/p7zip ??
-
-pkg_setup() {
-   # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
-   # TLDR; every combination of options (clang|gcc)+(asm/noasm)
-   # has a dedicated makefile & builddir
-   mfile="cmpl"
-   if tc-is-clang; then
-   mfile="${mfile}_clang"
-   bdir=c
-   elif tc-is-gcc; then
-   mfile="${mfile}_gcc"
-   bdir=g
-   else
-   die "Unsupported compiler: $(tc-getCC)"
-   fi
-   if use jwasm || use uasm ; then
-   mfile="${mfile}_x64"
-   bdir="${bdir}_x64"
-   fi
-   export mfile="${mfile}.mak"
-   export bdir
-}
-
-src_prepare() {
-   # patch doesn't deal with CRLF even if file+patch match
-   # not even with --ignore-whitespace, --binary or --force
-   pushd "./CPP/7zip" || die "Unable to switch directory"
-   edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
-   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
-   popd >/dev/null || die "Unable to switch directory"
-
-   default
-}
-
-src_compile() {
-   pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
-
-   # avoid executable stack when using uasm/jwasm, harmless otherwise
-   append-ldflags -Wl,-z,noexecstack
-   export G_CFLAGS=${CFLAGS}
-   export G_CXXFLAGS=${CXXFLAGS}
-   export G_LDFLAGS=${LDFLAGS}
-
-   local args=(
-   -f "../../${mfile}"
-   CC=$(tc-getCC)
-   CXX=$(tc-getCXX)
-   )
-   # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
-   # whether it's defined or not. so in case user has `rar` enabled
-   # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
-   if ! use rar; then
-   # disables non-free rar code but allows listing and extracting
-   # non-compressed rar archives
-   args+=( DISABLE_RAR_COMPRESS=1 )
-   fi
-   if use jwasm; then
-   args+=( USE_JWASM=1 )
-   elif use uasm; then
-   args+=( MY_ASM=uasm )
-   fi
-
-   mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
-   emake ${args[@]}
-   popd > /dev/null || die "Unable to switch directory"
-}
-
-src_install() {
-   dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
-   einstalldocs
-}

diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
index 0080f01dee42..b551b3c3e9cd 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -1,5 +1,3 @@
-DIST 7z2407-linux-x64.tar.xz 1554932 BLAKE2B 
9229fdac09148c50032656743aba0f8ce1ec06b7fd2dad2c693dc299c5f83fc093ba047e9c3c3971bf4cc9387b0db52c84167202ed7fcecfcc6f5bc508d04ada
 SHA512 
31b5bb832e73f3c2fd0437873fe6130b8d1bd1bea8320d1b27d06bf40dd737758732eb3664fab2c36417b96ffc5daca6607b6f1aefdaa9e697122da60e37a728
-DIST 7z2407-src.tar.xz 1488556 BLAKE2B 
42b4f9553aaa4797e80a2d50073ff0e77b5261e50766f8c596a632fb013ac1514a2963f27b924485f07728d13a4536c69911867e3728e8f8604ec25fc4c6824e
 SHA512 
0299e5c1e1df

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-12-06 Thread Arthur Zamarin

commit: c6181bc30da5f0d2ccf7749e6938adcf85b9ab0d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  6 19:20:09 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  6 19:44:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6181bc3

app-arch/7zip: add 24.09

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.09.ebuild | 111 
 app-arch/7zip/Manifest  |   2 +
 2 files changed, 113 insertions(+)

diff --git a/app-arch/7zip/7zip-24.09.ebuild b/app-arch/7zip/7zip-24.09.ebuild
new file mode 100644
index ..65deea631e60
--- /dev/null
+++ b/app-arch/7zip/7zip-24.09.ebuild
@@ -0,0 +1,111 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix flag-o-matic toolchain-funcs
+
+NO_DOT_PV=$(ver_rs 1- '')
+DESCRIPTION="Free file archiver for extremely high compression"
+HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
+# linux-x64 tarball is only used for docs
+SRC_URI="
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
+"
+S="${WORKDIR}"
+
+LICENSE="LGPL-2 BSD rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv"
+IUSE="uasm jwasm rar"
+REQUIRED_USE="?? ( uasm jwasm )"
+
+DOCS=( readme.txt History.txt License.txt )
+HTML_DOCS=( MANUAL )
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   app-arch/xz-utils[extra-filters(+)]
+   uasm? ( dev-lang/uasm )
+   jwasm? ( dev-lang/jwasm )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-24.05-respect-build-env.patch"
+)
+
+# TODO(NRK): also build and install the library
+# TODO(NRK): make it so this package can be used as a drop-in replacement
+# for app-arch/p7zip ??
+
+pkg_setup() {
+   # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
+   # TLDR; every combination of options (clang|gcc)+(asm/noasm)
+   # has a dedicated makefile & builddir
+   mfile="cmpl"
+   if tc-is-clang; then
+   mfile="${mfile}_clang"
+   bdir=c
+   elif tc-is-gcc; then
+   mfile="${mfile}_gcc"
+   bdir=g
+   else
+   die "Unsupported compiler: $(tc-getCC)"
+   fi
+   if use jwasm || use uasm ; then
+   mfile="${mfile}_x64"
+   bdir="${bdir}_x64"
+   fi
+   export mfile="${mfile}.mak"
+   export bdir
+}
+
+src_prepare() {
+   # patch doesn't deal with CRLF even if file+patch match
+   # not even with --ignore-whitespace, --binary or --force
+   pushd "./CPP/7zip" || die "Unable to switch directory"
+   edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
+   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
+   popd >/dev/null || die "Unable to switch directory"
+
+   default
+}
+
+src_compile() {
+   pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
+
+   # avoid executable stack when using uasm/jwasm, harmless otherwise
+   append-ldflags -Wl,-z,noexecstack
+   export G_CFLAGS=${CFLAGS}
+   export G_CXXFLAGS=${CXXFLAGS}
+   export G_LDFLAGS=${LDFLAGS}
+
+   local args=(
+   -f "../../${mfile}"
+   CC=$(tc-getCC)
+   CXX=$(tc-getCXX)
+   )
+   # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
+   # whether it's defined or not. so in case user has `rar` enabled
+   # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
+   if ! use rar; then
+   # disables non-free rar code but allows listing and extracting
+   # non-compressed rar archives
+   args+=( DISABLE_RAR_COMPRESS=1 )
+   fi
+   if use jwasm; then
+   args+=( USE_JWASM=1 )
+   elif use uasm; then
+   args+=( MY_ASM=uasm )
+   fi
+
+   mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
+   emake ${args[@]}
+   popd > /dev/null || die "Unable to switch directory"
+}
+
+src_install() {
+   dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
+   einstalldocs
+}

diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
index a3172bd3e9b9..0080f01dee42 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -2,3 +2,5 @@ DIST 7z2407-linux-x64.tar.xz 1554932 BLAKE2B 
9229fdac09148c50032656743aba0f8ce1e
 DIST 7z2407-src.tar.xz 1488556 BLAKE2B 
42b4f9553aaa4797e80a2d50073ff0e77b5261e50766f8c596a632fb013ac1514a2963f27b924485f07728d13a4536c69911867e3728e8f8604ec25fc4c6824e
 SHA512 
0299e5c1e1dfd33ecf22077f812da1f25bf2146a713c7a7e2498d639520f21f029e853914e66a84d1edfc5d721e1f3d914a3171ab336a406a94bc82d5b2d8e5d
 DIST 7z2408-linux-x64.tar.xz 1556956 BLAKE2B 
177b355830201e48d314667c1936e3ca0b624b3fd47b8696df7

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-10-27 Thread Arthur Zamarin

commit: 5bd074118ea6c4e3f1c2ab899e092d7e64720949
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Oct 27 18:07:41 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Oct 27 18:07:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd07411

app-arch/7zip: Keyword 24.08 ppc, #942353

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.08.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.08.ebuild b/app-arch/7zip/7zip-24.08.ebuild
index 3363640aefda..ad24c7a3ff6c 100644
--- a/app-arch/7zip/7zip-24.08.ebuild
+++ b/app-arch/7zip/7zip-24.08.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc ~riscv"
 IUSE="uasm jwasm rar"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-10-27 Thread Arthur Zamarin

commit: 93c7b0b6883787acc412b33026b212fe5a19e1f8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Oct 27 18:07:42 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Oct 27 18:07:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c7b0b6

app-arch/7zip: Keyword 24.08 ppc64, #942353

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.08.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.08.ebuild b/app-arch/7zip/7zip-24.08.ebuild
index ad24c7a3ff6c..e7a0ad11d26b 100644
--- a/app-arch/7zip/7zip-24.08.ebuild
+++ b/app-arch/7zip/7zip-24.08.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~riscv"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~riscv"
 IUSE="uasm jwasm rar"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-09-23 Thread Arthur Zamarin

commit: 61d0ba243f187dfb290dc0387737a4fbd5aac3f1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Sep 24 05:49:54 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Sep 24 05:49:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d0ba24

app-arch/7zip: Stabilize 24.08 arm64, #940176

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.08.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.08.ebuild b/app-arch/7zip/7zip-24.08.ebuild
index 016ed2c81191..3363640aefda 100644
--- a/app-arch/7zip/7zip-24.08.ebuild
+++ b/app-arch/7zip/7zip-24.08.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 IUSE="uasm jwasm rar"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-09-23 Thread Arthur Zamarin

commit: cc51ff0a4a4dd3a62296441eebdda51b942d0331
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Sep 23 17:48:29 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Sep 23 17:48:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc51ff0a

app-arch/7zip: Stabilize 24.08 amd64, #940176

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.08.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.08.ebuild b/app-arch/7zip/7zip-24.08.ebuild
index f1dd8bc716e5..016ed2c81191 100644
--- a/app-arch/7zip/7zip-24.08.ebuild
+++ b/app-arch/7zip/7zip-24.08.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="uasm jwasm rar"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/files/

2024-08-19 Thread Joonas Niilola

commit: aef3252046b1146d2d52ad2a3594709888318c0d
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Aug 20 06:34:04 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug 20 06:52:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef32520

app-arch/7zip: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Joonas Niilola  gentoo.org>

 .../7zip/files/7zip-23.01-respect-build-env.patch  | 53 --
 1 file changed, 53 deletions(-)

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
deleted file mode 100644
index a5871db9159c..
--- a/app-arch/7zip/files/7zip-23.01-respect-build-env.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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)

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-08-17 Thread Michael Orlitzky

commit: 5a5116d1e7312fd2b56339f32c85ee56d7faca6f
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Aug 18 01:21:48 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Aug 18 01:21:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5116d1

app-arch/7zip: keyword 24.08 for ~riscv

Signed-off-by: Michael Orlitzky  gentoo.org>

 app-arch/7zip/7zip-24.08.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.08.ebuild b/app-arch/7zip/7zip-24.08.ebuild
index 9197a468b7e9..f1dd8bc716e5 100644
--- a/app-arch/7zip/7zip-24.08.ebuild
+++ b/app-arch/7zip/7zip-24.08.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 IUSE="uasm jwasm rar"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-08-17 Thread Mike Gilbert

commit: c52b27ef4b39a59972b29e3e97cb584c70089583
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 22:15:12 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 22:15:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52b27ef

app-arch/7zip: depend on app-arch/xz-utils[extra-filters(+)]

Closes: https://bugs.gentoo.org/937989
Signed-off-by: Mike Gilbert  gentoo.org>

 app-arch/7zip/7zip-24.07.ebuild | 1 +
 app-arch/7zip/7zip-24.08.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-arch/7zip/7zip-24.07.ebuild b/app-arch/7zip/7zip-24.07.ebuild
index 8a1c6685947e..863cdc56fe57 100644
--- a/app-arch/7zip/7zip-24.07.ebuild
+++ b/app-arch/7zip/7zip-24.07.ebuild
@@ -26,6 +26,7 @@ HTML_DOCS=( MANUAL )
 
 DEPEND="${RDEPEND}"
 BDEPEND="
+   app-arch/xz-utils[extra-filters(+)]
uasm? ( dev-lang/uasm )
jwasm? ( dev-lang/jwasm )
 "

diff --git a/app-arch/7zip/7zip-24.08.ebuild b/app-arch/7zip/7zip-24.08.ebuild
index 59e13dc0c5e5..9197a468b7e9 100644
--- a/app-arch/7zip/7zip-24.08.ebuild
+++ b/app-arch/7zip/7zip-24.08.ebuild
@@ -26,6 +26,7 @@ HTML_DOCS=( MANUAL )
 
 DEPEND="${RDEPEND}"
 BDEPEND="
+   app-arch/xz-utils[extra-filters(+)]
uasm? ( dev-lang/uasm )
jwasm? ( dev-lang/jwasm )
 "

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-08-13 Thread Arthur Zamarin

commit: 4563695e65202c361e2923022a87bda73fdbd304
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Aug 13 18:31:22 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Aug 13 18:31:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4563695e

app-arch/7zip: add 24.08

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.08.ebuild | 110 
 app-arch/7zip/Manifest  |   2 +
 2 files changed, 112 insertions(+)

diff --git a/app-arch/7zip/7zip-24.08.ebuild b/app-arch/7zip/7zip-24.08.ebuild
new file mode 100644
index ..59e13dc0c5e5
--- /dev/null
+++ b/app-arch/7zip/7zip-24.08.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix flag-o-matic toolchain-funcs
+
+NO_DOT_PV=$(ver_rs 1- '')
+DESCRIPTION="Free file archiver for extremely high compression"
+HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
+# linux-x64 tarball is only used for docs
+SRC_URI="
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
+"
+S="${WORKDIR}"
+
+LICENSE="LGPL-2 BSD rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="uasm jwasm rar"
+REQUIRED_USE="?? ( uasm jwasm )"
+
+DOCS=( readme.txt History.txt License.txt )
+HTML_DOCS=( MANUAL )
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   uasm? ( dev-lang/uasm )
+   jwasm? ( dev-lang/jwasm )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-24.05-respect-build-env.patch"
+)
+
+# TODO(NRK): also build and install the library
+# TODO(NRK): make it so this package can be used as a drop-in replacement
+# for app-arch/p7zip ??
+
+pkg_setup() {
+   # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
+   # TLDR; every combination of options (clang|gcc)+(asm/noasm)
+   # has a dedicated makefile & builddir
+   mfile="cmpl"
+   if tc-is-clang; then
+   mfile="${mfile}_clang"
+   bdir=c
+   elif tc-is-gcc; then
+   mfile="${mfile}_gcc"
+   bdir=g
+   else
+   die "Unsupported compiler: $(tc-getCC)"
+   fi
+   if use jwasm || use uasm ; then
+   mfile="${mfile}_x64"
+   bdir="${bdir}_x64"
+   fi
+   export mfile="${mfile}.mak"
+   export bdir
+}
+
+src_prepare() {
+   # patch doesn't deal with CRLF even if file+patch match
+   # not even with --ignore-whitespace, --binary or --force
+   pushd "./CPP/7zip" || die "Unable to switch directory"
+   edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
+   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
+   popd >/dev/null || die "Unable to switch directory"
+
+   default
+}
+
+src_compile() {
+   pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
+
+   # avoid executable stack when using uasm/jwasm, harmless otherwise
+   append-ldflags -Wl,-z,noexecstack
+   export G_CFLAGS=${CFLAGS}
+   export G_CXXFLAGS=${CXXFLAGS}
+   export G_LDFLAGS=${LDFLAGS}
+
+   local args=(
+   -f "../../${mfile}"
+   CC=$(tc-getCC)
+   CXX=$(tc-getCXX)
+   )
+   # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
+   # whether it's defined or not. so in case user has `rar` enabled
+   # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
+   if ! use rar; then
+   # disables non-free rar code but allows listing and extracting
+   # non-compressed rar archives
+   args+=( DISABLE_RAR_COMPRESS=1 )
+   fi
+   if use jwasm; then
+   args+=( USE_JWASM=1 )
+   elif use uasm; then
+   args+=( MY_ASM=uasm )
+   fi
+
+   mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
+   emake ${args[@]}
+   popd > /dev/null || die "Unable to switch directory"
+}
+
+src_install() {
+   dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
+   einstalldocs
+}

diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
index b9f9fdee7c9d..a3172bd3e9b9 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -1,2 +1,4 @@
 DIST 7z2407-linux-x64.tar.xz 1554932 BLAKE2B 
9229fdac09148c50032656743aba0f8ce1ec06b7fd2dad2c693dc299c5f83fc093ba047e9c3c3971bf4cc9387b0db52c84167202ed7fcecfcc6f5bc508d04ada
 SHA512 
31b5bb832e73f3c2fd0437873fe6130b8d1bd1bea8320d1b27d06bf40dd737758732eb3664fab2c36417b96ffc5daca6607b6f1aefdaa9e697122da60e37a728
 DIST 7z2407-src.tar.xz 1488556 BLAKE2B 
42b4f9553aaa4797e80a2d50073ff0e77b5261e50766f8c596a632fb013ac1514a2963f27b924485f07728d13a4536c69911867e3728e8f8604ec25fc4c6824e
 SHA512 
0299e5c1e1dfd33ecf22077f812da1f25bf2146a713c7a7e2498d63952

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-08-01 Thread Sam James

commit: 72e76a45a45eba007836879a7d94add69d300256
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug  2 01:05:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug  2 01:05:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e76a45

app-arch/7zip: Stabilize 24.07 arm64, #937105

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-24.07.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/7zip-24.07.ebuild b/app-arch/7zip/7zip-24.07.ebuild
index 59e13dc0c5e5..a3c3c91f0076 100644
--- a/app-arch/7zip/7zip-24.07.ebuild
+++ b/app-arch/7zip/7zip-24.07.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 arm64"
 IUSE="uasm jwasm rar"
 REQUIRED_USE="?? ( uasm jwasm )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-08-01 Thread Arthur Zamarin

commit: b27f9848e62d19f66db9f4776a15e7b79bcbbfa6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Aug  1 19:16:40 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Aug  1 19:23:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b27f9848

app-arch/7zip: use https for metadata.xml

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/7zip/metadata.xml b/app-arch/7zip/metadata.xml
index a4f1984333a5..772c93a14f12 100644
--- a/app-arch/7zip/metadata.xml
+++ b/app-arch/7zip/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd";>
+https://www.gentoo.org/dtd/metadata.dtd";>
 

[email protected]

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-08-01 Thread Arthur Zamarin

commit: 3ad06922103bc963750b01debac3e269517fe3ea
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Aug  1 19:17:03 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Aug  1 19:23:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ad06922

app-arch/7zip: drop 23.01, 24.05, 24.06

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-23.01.ebuild | 110 
 app-arch/7zip/7zip-24.05.ebuild | 110 
 app-arch/7zip/7zip-24.06.ebuild | 110 
 app-arch/7zip/Manifest  |   6 ---
 4 files changed, 336 deletions(-)

diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild
deleted file mode 100644
index 0d983a22a12f..
--- a/app-arch/7zip/7zip-23.01.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edos2unix flag-o-matic toolchain-funcs
-
-NO_DOT_PV=$(ver_rs 1- '')
-DESCRIPTION="Free file archiver for extremely high compression"
-HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
-# linux-x64 tarball is only used for docs
-SRC_URI="
-   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
-   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
-"
-S="${WORKDIR}"
-
-LICENSE="LGPL-2 BSD rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-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
-
-   mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
-   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/7zip-24.05.ebuild b/app-arch/7zip/7zip-24.05.ebuild
deleted file mode 100644
index 0d983a22a12f..
--- a/app-arch/7zip/7zip-24.05.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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/";
-# linu

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-07-03 Thread Arthur Zamarin

commit: 939dceaa741a1e8ef1d699b0eca904d49e374513
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jul  3 19:06:33 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jul  3 19:09:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=939dceaa

app-arch/7zip: add 24.07

Closes: https://bugs.gentoo.org/935412
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.07.ebuild | 110 
 app-arch/7zip/Manifest  |   2 +
 2 files changed, 112 insertions(+)

diff --git a/app-arch/7zip/7zip-24.07.ebuild b/app-arch/7zip/7zip-24.07.ebuild
new file mode 100644
index ..59e13dc0c5e5
--- /dev/null
+++ b/app-arch/7zip/7zip-24.07.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix flag-o-matic toolchain-funcs
+
+NO_DOT_PV=$(ver_rs 1- '')
+DESCRIPTION="Free file archiver for extremely high compression"
+HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
+# linux-x64 tarball is only used for docs
+SRC_URI="
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
+"
+S="${WORKDIR}"
+
+LICENSE="LGPL-2 BSD rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="uasm jwasm rar"
+REQUIRED_USE="?? ( uasm jwasm )"
+
+DOCS=( readme.txt History.txt License.txt )
+HTML_DOCS=( MANUAL )
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   uasm? ( dev-lang/uasm )
+   jwasm? ( dev-lang/jwasm )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-24.05-respect-build-env.patch"
+)
+
+# TODO(NRK): also build and install the library
+# TODO(NRK): make it so this package can be used as a drop-in replacement
+# for app-arch/p7zip ??
+
+pkg_setup() {
+   # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
+   # TLDR; every combination of options (clang|gcc)+(asm/noasm)
+   # has a dedicated makefile & builddir
+   mfile="cmpl"
+   if tc-is-clang; then
+   mfile="${mfile}_clang"
+   bdir=c
+   elif tc-is-gcc; then
+   mfile="${mfile}_gcc"
+   bdir=g
+   else
+   die "Unsupported compiler: $(tc-getCC)"
+   fi
+   if use jwasm || use uasm ; then
+   mfile="${mfile}_x64"
+   bdir="${bdir}_x64"
+   fi
+   export mfile="${mfile}.mak"
+   export bdir
+}
+
+src_prepare() {
+   # patch doesn't deal with CRLF even if file+patch match
+   # not even with --ignore-whitespace, --binary or --force
+   pushd "./CPP/7zip" || die "Unable to switch directory"
+   edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
+   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
+   popd >/dev/null || die "Unable to switch directory"
+
+   default
+}
+
+src_compile() {
+   pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
+
+   # avoid executable stack when using uasm/jwasm, harmless otherwise
+   append-ldflags -Wl,-z,noexecstack
+   export G_CFLAGS=${CFLAGS}
+   export G_CXXFLAGS=${CXXFLAGS}
+   export G_LDFLAGS=${LDFLAGS}
+
+   local args=(
+   -f "../../${mfile}"
+   CC=$(tc-getCC)
+   CXX=$(tc-getCXX)
+   )
+   # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
+   # whether it's defined or not. so in case user has `rar` enabled
+   # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
+   if ! use rar; then
+   # disables non-free rar code but allows listing and extracting
+   # non-compressed rar archives
+   args+=( DISABLE_RAR_COMPRESS=1 )
+   fi
+   if use jwasm; then
+   args+=( USE_JWASM=1 )
+   elif use uasm; then
+   args+=( MY_ASM=uasm )
+   fi
+
+   mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
+   emake ${args[@]}
+   popd > /dev/null || die "Unable to switch directory"
+}
+
+src_install() {
+   dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
+   einstalldocs
+}

diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
index d0f226033c4e..763dd2f63f9e 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -4,3 +4,5 @@ DIST 7z2405-linux-x64.tar.xz 1553872 BLAKE2B 
d6c0bd4eb81f4112bfe50bf6affc68021b0
 DIST 7z2405-src.tar.xz 1486772 BLAKE2B 
609c7ae8b89e56e747ebfecb25108d8918138f48f0f2ed73183c76101ddd3615aafb9eb7823be0de2a434b450587e01f476d2ed092628a311b6e4ed091e06260
 SHA512 
d340adfa68e818dd3d3aa411780c81532fa37b6649178b81ec3739725f83e0bc3c01744612b2d467f4d0c2cc984dd35488406d7baee185cf372acebd9c0123a7
 DIST 7z2406-linux-x64.tar.xz 1551724 BLAKE2B 
e4cc8141b074209b58018e6aeb4b91f140160d5d52e1fba59da2d0cfcd41c488cbfa4bda99b

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-06-10 Thread Arthur Zamarin

commit: a999b2805f728b160f95414b3aa8c7dd4d9f8acf
Author: NRK  disroot  org>
AuthorDate: Sun Jun  9 11:23:18 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jun 11 05:29:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a999b280

app-arch/7zip: fix makefile mkdir race

Closes: https://bugs.gentoo.org/933619
Signed-off-by: NRK  disroot.org>
Closes: https://github.com/gentoo/gentoo/pull/37093
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-23.01.ebuild | 1 +
 app-arch/7zip/7zip-24.05.ebuild | 1 +
 app-arch/7zip/7zip-24.06.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild
index 4393a0da0302..51c0b76b70b0 100644
--- a/app-arch/7zip/7zip-23.01.ebuild
+++ b/app-arch/7zip/7zip-23.01.ebuild
@@ -99,6 +99,7 @@ src_compile() {
args+=( MY_ASM=uasm )
fi
 
+   mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
emake ${args[@]}
popd > /dev/null || die "Unable to switch directory"
 }

diff --git a/app-arch/7zip/7zip-24.05.ebuild b/app-arch/7zip/7zip-24.05.ebuild
index 4393a0da0302..51c0b76b70b0 100644
--- a/app-arch/7zip/7zip-24.05.ebuild
+++ b/app-arch/7zip/7zip-24.05.ebuild
@@ -99,6 +99,7 @@ src_compile() {
args+=( MY_ASM=uasm )
fi
 
+   mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
emake ${args[@]}
popd > /dev/null || die "Unable to switch directory"
 }

diff --git a/app-arch/7zip/7zip-24.06.ebuild b/app-arch/7zip/7zip-24.06.ebuild
index 4c6458379962..a6bf83168b8c 100644
--- a/app-arch/7zip/7zip-24.06.ebuild
+++ b/app-arch/7zip/7zip-24.06.ebuild
@@ -99,6 +99,7 @@ src_compile() {
args+=( MY_ASM=uasm )
fi
 
+   mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
emake ${args[@]}
popd > /dev/null || die "Unable to switch directory"
 }

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-06-04 Thread Arthur Zamarin

commit: cb014286ed695e4b7519831477542e54e721ab72
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jun  4 18:25:06 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jun  4 18:25:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb014286

app-arch/7zip: add 24.06

Closes: https://bugs.gentoo.org/932376
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.06.ebuild | 109 
 app-arch/7zip/Manifest  |   2 +
 2 files changed, 111 insertions(+)

diff --git a/app-arch/7zip/7zip-24.06.ebuild b/app-arch/7zip/7zip-24.06.ebuild
new file mode 100644
index ..4c6458379962
--- /dev/null
+++ b/app-arch/7zip/7zip-24.06.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix flag-o-matic toolchain-funcs
+
+NO_DOT_PV=$(ver_rs 1- '')
+DESCRIPTION="Free file archiver for extremely high compression"
+HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
+# linux-x64 tarball is only used for docs
+SRC_URI="
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
+"
+S="${WORKDIR}"
+
+LICENSE="LGPL-2 BSD rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="uasm jwasm rar"
+REQUIRED_USE="?? ( uasm jwasm )"
+
+DOCS=( readme.txt History.txt License.txt )
+HTML_DOCS=( MANUAL )
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   uasm? ( dev-lang/uasm )
+   jwasm? ( dev-lang/jwasm )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-24.05-respect-build-env.patch"
+)
+
+# TODO(NRK): also build and install the library
+# TODO(NRK): make it so this package can be used as a drop-in replacement
+# for app-arch/p7zip ??
+
+pkg_setup() {
+   # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
+   # TLDR; every combination of options (clang|gcc)+(asm/noasm)
+   # has a dedicated makefile & builddir
+   mfile="cmpl"
+   if tc-is-clang; then
+   mfile="${mfile}_clang"
+   bdir=c
+   elif tc-is-gcc; then
+   mfile="${mfile}_gcc"
+   bdir=g
+   else
+   die "Unsupported compiler: $(tc-getCC)"
+   fi
+   if use jwasm || use uasm ; then
+   mfile="${mfile}_x64"
+   bdir="${bdir}_x64"
+   fi
+   export mfile="${mfile}.mak"
+   export bdir
+}
+
+src_prepare() {
+   # patch doesn't deal with CRLF even if file+patch match
+   # not even with --ignore-whitespace, --binary or --force
+   pushd "./CPP/7zip" || die "Unable to switch directory"
+   edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
+   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
+   popd >/dev/null || die "Unable to switch directory"
+
+   default
+}
+
+src_compile() {
+   pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
+
+   # avoid executable stack when using uasm/jwasm, harmless otherwise
+   append-ldflags -Wl,-z,noexecstack
+   export G_CFLAGS=${CFLAGS}
+   export G_CXXFLAGS=${CXXFLAGS}
+   export G_LDFLAGS=${LDFLAGS}
+
+   local args=(
+   -f "../../${mfile}"
+   CC=$(tc-getCC)
+   CXX=$(tc-getCXX)
+   )
+   # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
+   # whether it's defined or not. so in case user has `rar` enabled
+   # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
+   if ! use rar; then
+   # disables non-free rar code but allows listing and extracting
+   # non-compressed rar archives
+   args+=( DISABLE_RAR_COMPRESS=1 )
+   fi
+   if use jwasm; then
+   args+=( USE_JWASM=1 )
+   elif use uasm; then
+   args+=( MY_ASM=uasm )
+   fi
+
+   emake ${args[@]}
+   popd > /dev/null || die "Unable to switch directory"
+}
+
+src_install() {
+   dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
+   einstalldocs
+}

diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
index 558db29a9ad6..d0f226033c4e 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -2,3 +2,5 @@ DIST 7z2301-linux-x64.tar.xz 1527700 BLAKE2B 
35dc74f0a7a4e586ea5ae969dce72c14e02
 DIST 7z2301-src.tar.xz 1378588 BLAKE2B 
348484b24b39db70e513fe50d79954ea0e2dd669f83e3601fa796c8f0ca4734132ca20fac8cda9b8ba550bad9146627fc0ae07056abb99028ef6d825b6a533bd
 SHA512 
e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986
 DIST 7z2405-linux-x64.tar.xz 1553872 BLAKE2B 
d6c0bd4eb81f4112bfe50bf6affc68021b03d059076af5519a41c8d471e978ad2b4acc8f67c650070f9d07c518741a0146579ddfb8d56fd125f6db0beece0990
 SHA512 
13f97236157e2761a

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/files/, app-arch/7zip/

2024-05-18 Thread Arthur Zamarin

commit: fb8a4dea17cbe68295417ad1f5b4cb37665d24bc
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May 18 07:55:05 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May 18 07:55:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb8a4dea

app-arch/7zip: add 24.05

Closes: https://bugs.gentoo.org/928730
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-24.05.ebuild| 109 +
 app-arch/7zip/Manifest |   2 +
 .../7zip/files/7zip-24.05-respect-build-env.patch  |  52 ++
 3 files changed, 163 insertions(+)

diff --git a/app-arch/7zip/7zip-24.05.ebuild b/app-arch/7zip/7zip-24.05.ebuild
new file mode 100644
index ..4393a0da0302
--- /dev/null
+++ b/app-arch/7zip/7zip-24.05.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix flag-o-matic toolchain-funcs
+
+NO_DOT_PV=$(ver_rs 1- '')
+DESCRIPTION="Free file archiver for extremely high compression"
+HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
+# linux-x64 tarball is only used for docs
+SRC_URI="
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
+   
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
+"
+S="${WORKDIR}"
+
+LICENSE="LGPL-2 BSD rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="uasm jwasm rar"
+REQUIRED_USE="?? ( uasm jwasm )"
+
+DOCS=( readme.txt History.txt License.txt )
+HTML_DOCS=( MANUAL )
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   uasm? ( dev-lang/uasm )
+   jwasm? ( dev-lang/jwasm )
+"
+
+PATCHES=(
+   "${FILESDIR}/${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
index bd132922c901..558db29a9ad6 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -1,2 +1,4 @@
 DIST 7z2301-linux-x64.tar.xz 1527700 BLAKE2B 
35dc74f0a7a4e586ea5ae969dce72c14e0231822630d2d70f24e1c911cea0492354a258ef65096a6ce0da1510117c12466bc6cda577cdf9e8e74ede17e47f23e
 SHA512 
d3549468de8fd161e4c9233fa0b170af1f28c74749d20f3d0eeb3873857f6c6d2cc0777d564e6a79be7cc21c9e982e10710a795320428dc51db809a8d0f9454e
 DIST 7z2301-src.tar.xz 1378588 BLAKE2B 
348484b24b39db70e513fe50d79954ea0e2dd669f83e3601fa796c8f0ca4734132ca20fac8cda9b8ba550bad9146627fc0ae07056abb99028ef6d825b6a533bd
 SHA512 
e39f660c023aa65e55

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/files/, app-arch/7zip/

2024-04-12 Thread Arthur Zamarin

commit: 8d68b319a21d850d0080ac3c17a1d498bc224ac0
Author: NRK  disroot  org>
AuthorDate: Sat Apr 13 00:16:56 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 06:13:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d68b319

app-arch/7zip: fix #929025, add some comments

Closes: https://bugs.gentoo.org/929025
Signed-off-by: NRK  disroot.org>
Closes: https://github.com/gentoo/gentoo/pull/36230
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/7zip/7zip-23.01.ebuild| 16 
 app-arch/7zip/files/7zip-23.01-respect-build-env.patch |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild
index 631aad045b4c..cd0af0601e23 100644
--- a/app-arch/7zip/7zip-23.01.ebuild
+++ b/app-arch/7zip/7zip-23.01.ebuild
@@ -8,12 +8,12 @@ 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 used for docs
+# 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}/CPP/7zip"
+S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
@@ -63,16 +63,18 @@ pkg_setup() {
 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
-
-   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
 }
 
 src_compile() {
-   pushd "./Bundles/Alone2" || die "Unable to switch directory"
+   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}
@@ -102,8 +104,6 @@ src_compile() {
 }
 
 src_install() {
-   dobin "./Bundles/Alone2/b/${bdir}/7zz"
-
-   pushd "${WORKDIR}" || die "Unable to switch directory"
+   dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
einstalldocs
 }

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
index c897cf625931..a5871db9159c 100644
--- a/app-arch/7zip/files/7zip-23.01-respect-build-env.patch
+++ b/app-arch/7zip/files/7zip-23.01-respect-build-env.patch
@@ -5,8 +5,8 @@ Bug: https://bugs.gentoo.org/913188
 Bug: https://bugs.gentoo.org/913189
 
 
 a/7zip_gcc.mak
-+++ b/7zip_gcc.mak
+--- 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

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-04-05 Thread Sam James

commit: bc22d421c09f3d51af982677107f173ff6c10932
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  5 14:27:13 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  5 14:29:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc22d421

app-arch/7zip: further style tweaks

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-23.01.ebuild | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild
index 7fc3ee2b671f..631aad045b4c 100644
--- a/app-arch/7zip/7zip-23.01.ebuild
+++ b/app-arch/7zip/7zip-23.01.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=8
 
-inherit edos2unix toolchain-funcs flag-o-matic
+inherit edos2unix flag-o-matic toolchain-funcs
 
 NO_DOT_PV=$(ver_rs 1- '')
-DESCRIPTION="A free file archiver for extremely high compression"
+DESCRIPTION="Free file archiver for extremely high compression"
 HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
 # linux-x64 tarball is used for docs
 SRC_URI="
@@ -30,6 +30,10 @@ BDEPEND="
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 ??
@@ -60,18 +64,20 @@ src_prepare() {
# patch doesn't deal with CRLF even if file+patch match
# not even with --ignore-whitespace, --binary or --force
edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
-   PATCHES+=( "${FILESDIR}/${P}-respect-build-env.patch" )
 
-   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
default
+
+   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
 }
 
 src_compile() {
pushd "./Bundles/Alone2" || die "Unable to switch directory"
+
append-ldflags -Wl,-z,noexecstack
export G_CFLAGS=${CFLAGS}
export G_CXXFLAGS=${CXXFLAGS}
export G_LDFLAGS=${LDFLAGS}
+
local args=(
-f "../../${mfile}"
CC=$(tc-getCC)
@@ -83,13 +89,14 @@ src_compile() {
if ! use rar; then
# disables non-free rar code but allows listing and extracting
# non-compressed rar archives
-   args+=(DISABLE_RAR_COMPRESS=1)
+   args+=( DISABLE_RAR_COMPRESS=1 )
fi
if use jwasm; then
-   args+=(USE_JWASM=1)
+   args+=( USE_JWASM=1 )
elif use uasm; then
-   args+=(MY_ASM=uasm)
+   args+=( MY_ASM=uasm )
fi
+
emake ${args[@]}
popd > /dev/null || die "Unable to switch directory"
 }

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-04-05 Thread Sam James

commit: 24f3c432c9798898a3e5d544dee4db3bf2edf57c
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  5 14:21:26 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  5 14:25:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24f3c432

app-arch/7zip: add comment re doc tarball

Per 5e9e2ad78d04b60b5e2bfcd6174b9482e27a2003 in guru.

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-23.01.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild
index 9e0a080b3a69..7fc3ee2b671f 100644
--- a/app-arch/7zip/7zip-23.01.ebuild
+++ b/app-arch/7zip/7zip-23.01.ebuild
@@ -8,6 +8,7 @@ inherit edos2unix toolchain-funcs flag-o-matic
 NO_DOT_PV=$(ver_rs 1- '')
 DESCRIPTION="A free file archiver for extremely high compression"
 HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
+# linux-x64 tarball is 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

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-04-05 Thread Sam James

commit: 1770df8d1f9477246a4dc5bd047f25231908541b
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  5 14:12:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  5 14:25:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1770df8d

app-arch/7zip: style tweaks

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-23.01.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild
index e06bd67cdb4b..4c0797c5cb06 100644
--- a/app-arch/7zip/7zip-23.01.ebuild
+++ b/app-arch/7zip/7zip-23.01.ebuild
@@ -12,14 +12,14 @@ SRC_URI="

https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz/download
 -> ${PN}-${PV}.tar.xz

https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz/download
 -> ${PN}-${PV}-linux.tar.xz
 "
-LICENSE="LGPL-2 BSD rar? ( unRAR )"
+S="${WORKDIR}/CPP/7zip"
 
-IUSE="uasm jwasm rar"
-REQUIRED_USE="?? ( uasm jwasm )"
+LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="uasm jwasm rar"
+REQUIRED_USE="?? ( uasm jwasm )"
 
-S="${WORKDIR}/CPP/7zip/"
 DOCS=( readme.txt History.txt License.txt )
 HTML_DOCS=( MANUAL )
 RESTRICT="mirror"

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-04-05 Thread Sam James

commit: 3b1a0e97a03fae57c50fbc61d3654a976e5b0050
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  5 14:20:28 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  5 14:25:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b1a0e97

app-arch/7zip: drop mirror restriction

I don't see a need for this and app-arch/p7zip doesn't have it. This was there
since initial import in guru at 9033c9230b8c6a3b6f21713229a128c91714be56 so
probably just the usual "want to avoid useless mirror fetches when we know
it's not there".

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-23.01.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild
index b07e78cb3634..9e0a080b3a69 100644
--- a/app-arch/7zip/7zip-23.01.ebuild
+++ b/app-arch/7zip/7zip-23.01.ebuild
@@ -22,7 +22,6 @@ REQUIRED_USE="?? ( uasm jwasm )"
 
 DOCS=( readme.txt History.txt License.txt )
 HTML_DOCS=( MANUAL )
-RESTRICT="mirror"
 
 DEPEND="${RDEPEND}"
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/, app-arch/7zip/files/

2024-04-05 Thread Sam James

commit: e0577057b8cc6b4bb3c1445a7d1015843ef1cb54
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  5 14:11:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  5 14:25:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0577057

app-arch/7zip: new package, add 23.01

Imported from ::guru as of commit ea612f548c48f74fce1abc60d5ad205c521c7492.

Adding arthur and myself as well as NRK as discussed in #gentoo-guru. I'll
email the other maint in guru too.

Bug: https://bugs.gentoo.org/664664
Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-23.01.ebuild| 102 +
 app-arch/7zip/Manifest |   2 +
 .../7zip/files/7zip-23.01-respect-build-env.patch  |  53 +++
 app-arch/7zip/metadata.xml |  28 ++
 4 files changed, 185 insertions(+)

diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild
new file mode 100644
index ..e06bd67cdb4b
--- /dev/null
+++ b/app-arch/7zip/7zip-23.01.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix toolchain-funcs flag-o-matic
+
+NO_DOT_PV=$(ver_rs 1- '')
+DESCRIPTION="A free file archiver for extremely high compression"
+HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
+SRC_URI="
+   
https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz/download
 -> ${PN}-${PV}.tar.xz
+   
https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz/download
 -> ${PN}-${PV}-linux.tar.xz
+"
+LICENSE="LGPL-2 BSD rar? ( unRAR )"
+
+IUSE="uasm jwasm rar"
+REQUIRED_USE="?? ( uasm jwasm )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/CPP/7zip/"
+DOCS=( readme.txt History.txt License.txt )
+HTML_DOCS=( MANUAL )
+RESTRICT="mirror"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   uasm? ( dev-lang/uasm )
+   jwasm? ( dev-lang/jwasm )
+"
+
+# 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
+   edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
+   PATCHES+=( "${FILESDIR}/${P}-respect-build-env.patch" )
+
+   sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
+   default
+}
+
+src_compile() {
+   pushd "./Bundles/Alone2" || die "Unable to switch directory"
+   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 "./Bundles/Alone2/b/${bdir}/7zz"
+
+   pushd "${WORKDIR}" || die "Unable to switch directory"
+   einstalldocs
+}

diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
new file mode 100644
index ..39335efa329f
--- /dev/null
+++ b/app-arch/7zip/Manifest
@@ -0,0 +1,2 @@
+DIST 7zip-23.01-linux.tar.xz 1527700 BLAKE2B 
35dc74f0a7a4e586ea5ae969dce72c14e0231822630d2d70f24e1c911cea0492354a258ef65096a6ce0da1510117c12466bc6cda577cdf9e8e74ede17e47f23e
 SHA512 
d3549468de8fd161e4c9233fa0b170af1f28c74749d20f3d0eeb3873857f6c6d2cc0777d564e6a79be7cc21c9e982e10710a795320428dc51db809a8d0f9454e
+DIST 7zip-23.01.tar.xz 1378588 BLAKE2B 
348484

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-04-05 Thread Sam James

commit: 34b4d6414b7b2524d1f0dab023f2dc24b4cc000c
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  5 14:18:52 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  5 14:25:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b4d641

app-arch/7zip: simplify SRC_URI

Same checksums as before. This lets us avoid the rename too as well as killing
a too-long line.

Signed-off-by: Sam James  gentoo.org>

 app-arch/7zip/7zip-23.01.ebuild | 4 ++--
 app-arch/7zip/Manifest  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild
index 4c0797c5cb06..b07e78cb3634 100644
--- a/app-arch/7zip/7zip-23.01.ebuild
+++ b/app-arch/7zip/7zip-23.01.ebuild
@@ -9,8 +9,8 @@ NO_DOT_PV=$(ver_rs 1- '')
 DESCRIPTION="A free file archiver for extremely high compression"
 HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
 SRC_URI="
-   
https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz/download
 -> ${PN}-${PV}.tar.xz
-   
https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz/download
 -> ${PN}-${PV}-linux.tar.xz
+   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}/CPP/7zip"
 

diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
index 39335efa329f..bd132922c901 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -1,2 +1,2 @@
-DIST 7zip-23.01-linux.tar.xz 1527700 BLAKE2B 
35dc74f0a7a4e586ea5ae969dce72c14e0231822630d2d70f24e1c911cea0492354a258ef65096a6ce0da1510117c12466bc6cda577cdf9e8e74ede17e47f23e
 SHA512 
d3549468de8fd161e4c9233fa0b170af1f28c74749d20f3d0eeb3873857f6c6d2cc0777d564e6a79be7cc21c9e982e10710a795320428dc51db809a8d0f9454e
-DIST 7zip-23.01.tar.xz 1378588 BLAKE2B 
348484b24b39db70e513fe50d79954ea0e2dd669f83e3601fa796c8f0ca4734132ca20fac8cda9b8ba550bad9146627fc0ae07056abb99028ef6d825b6a533bd
 SHA512 
e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986
+DIST 7z2301-linux-x64.tar.xz 1527700 BLAKE2B 
35dc74f0a7a4e586ea5ae969dce72c14e0231822630d2d70f24e1c911cea0492354a258ef65096a6ce0da1510117c12466bc6cda577cdf9e8e74ede17e47f23e
 SHA512 
d3549468de8fd161e4c9233fa0b170af1f28c74749d20f3d0eeb3873857f6c6d2cc0777d564e6a79be7cc21c9e982e10710a795320428dc51db809a8d0f9454e
+DIST 7z2301-src.tar.xz 1378588 BLAKE2B 
348484b24b39db70e513fe50d79954ea0e2dd669f83e3601fa796c8f0ca4734132ca20fac8cda9b8ba550bad9146627fc0ae07056abb99028ef6d825b6a533bd
 SHA512 
e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986

48 matches

Mail list logo