From a11a17fc69ffdcc3fa4a097f3680e3e1ea14802f Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Sat, 13 Nov 2021 20:36:52 -0500
Subject: app-arch/7-zip: fix embarrassing USE mistake, metadata.xml
---
app-arch/7-zip/7-zip-21.04_beta-r1.ebuild | 71 +++++++++++++++++++++++++++++++
app-arch/7-zip/7-zip-21.04_beta.ebuild | 69 ------------------------------
app-arch/7-zip/metadata.xml | 3 ++
3 files changed, 74 insertions(+), 69 deletions(-)
create mode 100644 app-arch/7-zip/7-zip-21.04_beta-r1.ebuild
delete mode 100644 app-arch/7-zip/7-zip-21.04_beta.ebuild
diff --git a/app-arch/7-zip/7-zip-21.04_beta-r1.ebuild b/app-arch/7-zip/7-zip-21.04_beta-r1.ebuild
new file mode 100644
index 0000000..6c7a6c3
--- /dev/null
+++ b/app-arch/7-zip/7-zip-21.04_beta-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+MY_PV=${PV%%_*}
+MY_PV=${MY_PV//./}
+
+DESCRIPTION="File archiver with a high compression ratio"
+HOMEPAGE="https://7-zip.org/"
+SRC_URI="https://7-zip.org/a/7z${MY_PV}-src.7z"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+asm"
+
+BDEPEND="
+ || ( virtual/7z app-arch/libarchive app-arch/unar )
+ asm? (
+ amd64? ( dev-lang/uasm )
+ arm64? ( dev-lang/uasm )
+ x86? ( dev-lang/uasm )
+ )
+"
+
+S=${WORKDIR}/7z${MY_PV}-src
+
+PATCHES=( ${FILESDIR}/7-zip-flags.patch )
+
+src_unpack() {
+ if command -v 7z >/dev/null 2>&1; then
+ 7z x "${DISTDIR}/7z${MY_PV}-src.7z" -o"$S" || die
+ elif command -v bsdtar >/dev/null 2>&1; then
+ mkdir "$S" || die
+ bsdtar -C "$S" -xf "${DISTDIR}/7z${MY_PV}-src.7z" || die
+ elif command -v unar >/dev/null 2>&1; then
+ unar -d "$S" "${DISTDIR}/7z${MY_PV}-src.7z" || die
+ else
+ die "no 7z unpacker found"
+ fi
+}
+
+src_compile() {
+ cd CPP/7zip/Bundles/Alone2 || die
+ local myemakeargs=(
+ CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
+ CXX="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}"
+ CFLAGS_WARN_WALL="-Wall -Wextra"
+ )
+ if use asm; then
+ myemakeargs+=(USE_ASM=1 MY_ASM=uasm)
+ if use amd64; then
+ myemakeargs+=(IS_X64=1)
+ elif use arm64; then
+ myemakeargs+=(IS_ARM64=1)
+ elif use x86; then
+ myemakeargs+=(IS_X86=1)
+ fi
+ fi
+ mkdir -p b/g || die
+ emake -f ../../cmpl_gcc.mak "${myemakeargs[@]}"
+}
+
+src_install() {
+ dobin CPP/7zip/Bundles/Alone2/b/g/7zz
+ dosym 7zz /usr/bin/7z
+ dodoc DOC/*
+}
diff --git a/app-arch/7-zip/7-zip-21.04_beta.ebuild b/app-arch/7-zip/7-zip-21.04_beta.ebuild
deleted file mode 100644
index ee18d6b..0000000
--- a/app-arch/7-zip/7-zip-21.04_beta.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-MY_PV=${PV%%_*}
-MY_PV=${MY_PV//./}
-
-DESCRIPTION="File archiver with a high compression ratio"
-HOMEPAGE="https://7-zip.org/"
-SRC_URI="https://7-zip.org/a/7z${MY_PV}-src.7z"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+asm"
-
-BDEPEND="
- || ( virtual/7z app-arch/libarchive app-arch/unar )
- asm? (
- amd64? ( dev-lang/uasm )
- arm64? ( dev-lang/uasm )
- x86? ( dev-lang/uasm )
- )
-"
-
-S=${WORKDIR}/7z${MY_PV}-src
-
-PATCHES=( ${FILESDIR}/7-zip-flags.patch )
-
-src_unpack() {
- if command -v 7z >/dev/null 2>&1; then
- 7z x "${DISTDIR}/7z${MY_PV}-src.7z" -o"$S" || die
- elif command -v bsdtar >/dev/null 2>&1; then
- mkdir "$S" || die
- bsdtar -C "$S" -xf "${DISTDIR}/7z${MY_PV}-src.7z" || die
- elif command -v unar >/dev/null 2>&1; then
- unar -d "$S" "${DISTDIR}/7z${MY_PV}-src.7z" || die
- else
- die "no 7z unpacker found"
- fi
-}
-
-src_compile() {
- cd CPP/7zip/Bundles/Alone2 || die
- local myemakeargs=(
- CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
- CXX="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}"
- MY_ASM=uasm
- CFLAGS_WARN_WALL="-Wall -Wextra"
- )
- if use amd64; then
- myemakeargs+=(IS_X64=1 USE_ASM=1)
- elif use arm64; then
- myemakeargs+=(IS_ARM64=1 USE_ASM=1)
- elif use x86; then
- myemakeargs+=(IS_X86=1 USE_ASM=1)
- fi
- mkdir -p b/g || die
- emake -f ../../cmpl_gcc.mak "${myemakeargs[@]}"
-}
-
-src_install() {
- dobin CPP/7zip/Bundles/Alone2/b/g/7zz
- dosym 7zz /usr/bin/7z
- dodoc DOC/*
-}
diff --git a/app-arch/7-zip/metadata.xml b/app-arch/7-zip/metadata.xml
index 004555a..aab945b 100644
--- a/app-arch/7-zip/metadata.xml
+++ b/app-arch/7-zip/metadata.xml
@@ -5,4 +5,7 @@
<email>alex_y_xu@yahoo.ca</email>
<name>Alex Xu (Hello71)</name>
</maintainer>
+ <use>
+ <flag name="asm">Use assembly implementations (currently only amd64, arm64, x86)</flag>
+ </use>
</pkgmetadata>
--
cgit v1.2.3-70-g09d2