From f280eba5d5d473810b36bf1f5094d73d45ae6914 Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Tue, 1 Oct 2024 15:23:59 -0400
Subject: app-arch/7-zip: drop
upstreamed
---
app-arch/7-zip/7-zip-22.01.ebuild | 59 -------------------------------
app-arch/7-zip/Manifest | 1 -
app-arch/7-zip/files/7-zip-flags.patch | 28 ---------------
app-arch/7-zip/files/7-zip-less-asm.patch | 41 ---------------------
app-arch/7-zip/metadata.xml | 12 -------
5 files changed, 141 deletions(-)
delete mode 100644 app-arch/7-zip/7-zip-22.01.ebuild
delete mode 100644 app-arch/7-zip/Manifest
delete mode 100644 app-arch/7-zip/files/7-zip-flags.patch
delete mode 100644 app-arch/7-zip/files/7-zip-less-asm.patch
delete mode 100644 app-arch/7-zip/metadata.xml
diff --git a/app-arch/7-zip/7-zip-22.01.ebuild b/app-arch/7-zip/7-zip-22.01.ebuild
deleted file mode 100644
index 81229fc..0000000
--- a/app-arch/7-zip/7-zip-22.01.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-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.tar.xz"
-
-LICENSE="LGPL-2.1+ BSD rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+asm rar"
-
-BDEPEND="
- asm? ( dev-lang/jwasm )
-"
-RDEPEND="!app-arch/p7zip"
-
-S=${WORKDIR}
-
-PATCHES=(
- "${FILESDIR}/7-zip-flags.patch"
- "${FILESDIR}/7-zip-less-asm.patch"
-)
-
-src_compile() {
- cd CPP/7zip/Bundles/Alone2 || die
- local myemakeargs=(
- CC="$(tc-getCC) ${CFLAGS} -fno-strict-aliasing ${LDFLAGS}"
- CXX="$(tc-getCXX) ${CXXFLAGS} -fno-strict-aliasing ${LDFLAGS}"
- )
- if use asm; then
- myemakeargs+=(USE_ASM=1 USE_JWASM=1)
- if use amd64; then
- myemakeargs+=(IS_X64=1)
- elif use arm64; then
- myemakeargs+=(IS_ARM64=1)
- elif use x86; then
- myemakeargs+=(IS_X86=1)
- else
- einfo "asm is not supported on this arch, ignoring"
- fi
- fi
- use rar || myemakeargs+=(DISABLE_RAR=1)
- 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/Manifest b/app-arch/7-zip/Manifest
deleted file mode 100644
index ac40149..0000000
--- a/app-arch/7-zip/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST 7z2201-src.tar.xz 1291560 BLAKE2B 1d88234fdf9d7074e3dc6c243c209f694897ac23f82d7f5d4767186114245c1aa9c4290c8a538dc3cdd1074385ae9142f1efd22771942ec63d8c00ed38b7082b SHA512 3f391b1bd65a0654eb5b31b50f1d400f0ec38ab191d88e15849a6e4d164b7bf2ce4a6d70ec8b6e27bde1b83bb2d45b65c03129499334669e05ee025784be455a
diff --git a/app-arch/7-zip/files/7-zip-flags.patch b/app-arch/7-zip/files/7-zip-flags.patch
deleted file mode 100644
index 963037c..0000000
--- a/app-arch/7-zip/files/7-zip-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
---- a/CPP/7zip/7zip_gcc.mak 2021-11-20 04:00:00.000000000 -0500
-+++ b/CPP/7zip/7zip_gcc.mak 2021-12-16 11:01:16.236763027 -0500
-@@ -14,13 +14,13 @@
-
-
- ifneq ($(CC), xlc)
--CFLAGS_WARN_WALL = -Wall -Werror -Wextra
-+CFLAGS_WARN_WALL = -Wall -Wextra
- endif
-
- # for object file
- CFLAGS_BASE_LIST = -c
- # CFLAGS_BASE_LIST = -S
--CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
-+CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
- -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
- -fPIC
-
-@@ -162,7 +162,7 @@
- $(O):
- $(MY_MKDIR) $(O)
-
--LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
-+LFLAGS_ALL = $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
- $(PROGPATH): $(OBJS)
- $(CXX) -o $(PROGPATH) $(LFLAGS_ALL)
-
diff --git a/app-arch/7-zip/files/7-zip-less-asm.patch b/app-arch/7-zip/files/7-zip-less-asm.patch
deleted file mode 100644
index 040b445..0000000
--- a/app-arch/7-zip/files/7-zip-less-asm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/CPP/7zip/7zip_gcc.mak 2021-12-25 09:00:00.000000000 -0500
-+++ b/CPP/7zip/7zip_gcc.mak 2022-05-13 12:20:17.539629635 -0400
-@@ -1127,21 +1127,6 @@
- endif
- endif
-
--ifdef USE_X86_ASM
--$O/7zCrcOpt.o: ../../../../Asm/x86/7zCrcOpt.asm
-- $(MY_ASM) $(AFLAGS) $<
--$O/XzCrc64Opt.o: ../../../../Asm/x86/XzCrc64Opt.asm
-- $(MY_ASM) $(AFLAGS) $<
--$O/Sha1Opt.o: ../../../../Asm/x86/Sha1Opt.asm
-- $(MY_ASM) $(AFLAGS) $<
--$O/Sha256Opt.o: ../../../../Asm/x86/Sha256Opt.asm
-- $(MY_ASM) $(AFLAGS) $<
--
--ifndef USE_JWASM
--USE_X86_ASM_AES=1
--endif
--
--else
- $O/7zCrcOpt.o: ../../../../C/7zCrcOpt.c
- $(CC) $(CFLAGS) $<
- $O/XzCrc64Opt.o: ../../../../C/XzCrc64Opt.c
-@@ -1150,16 +1135,10 @@
- $(CC) $(CFLAGS) $<
- $O/Sha256Opt.o: ../../../../C/Sha256Opt.c
- $(CC) $(CFLAGS) $<
--endif
-
-
--ifdef USE_X86_ASM_AES
--$O/AesOpt.o: ../../../../Asm/x86/AesOpt.asm
-- $(MY_ASM) $(AFLAGS) $<
--else
- $O/AesOpt.o: ../../../../C/AesOpt.c
- $(CC) $(CFLAGS) $<
--endif
-
-
- ifdef USE_X64_ASM
diff --git a/app-arch/7-zip/metadata.xml b/app-arch/7-zip/metadata.xml
deleted file mode 100644
index d212dd9..0000000
--- a/app-arch/7-zip/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <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>
- <flag name="rar">RAR archive support, requires accepting unRAR license</flag>
- </use>
-</pkgmetadata>
--
cgit v1.2.3-70-g09d2