commit:     15d7bd9cbfdc51f50817b8d783da1d56127f3af2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 16:13:47 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 16:14:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15d7bd9c

app-arch/unzip: bump to v6.0p26

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-arch/unzip/Manifest             |  1 +
 app-arch/unzip/unzip-6.0_p26.ebuild | 88 +++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index dce593202f5..c23b209548e 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -1,2 +1,3 @@
 DIST unzip60.tar.gz 1376845 BLAKE2B 
5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47
 SHA512 
0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
 DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 
09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6
 SHA512 
13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
+DIST unzip_6.0-26.debian.tar.xz 23708 BLAKE2B 
7655396df2f8c4443bbd37a2fab590f1e66b3b8531871a6d95f281ac702e64a0e602f2412a58ff2addf4ce9cae8d146af650a18b02919d120c9db6c49df480b5
 SHA512 
9a56e400ad0984f87c7ee0548429349be549e35a3cae4c9acb88a8fb97a1d1fbd116cfa3292622ad8b2c67ffe79ae268861ddec1269993ba98f1a6a411b7611f

diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild 
b/app-arch/unzip/unzip-6.0_p26.ebuild
new file mode 100644
index 00000000000..636bf3cce0c
--- /dev/null
+++ b/app-arch/unzip/unzip-6.0_p26.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="${PV//.}"
+MY_PV="${MY_PV%_p*}"
+MY_P="${PN}${MY_PV}"
+
+DESCRIPTION="unzipper for pkzip-compressed files"
+HOMEPAGE="http://www.info-zip.org/";
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
+       mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 natspec unicode"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+       natspec? ( dev-libs/libnatspec )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+       local deb="${WORKDIR}"/debian/patches
+       rm "${deb}"/02-this-is-debian-unzip.patch || die
+       eapply "${deb}"/*.patch
+
+       eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
+       eapply "${FILESDIR}"/${PN}-6.0-format-security.patch
+       eapply 
"${FILESDIR}"/${PN}-6.0-fix-false-overlap-detection-on-32bit-systems.patch
+       use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
+       sed -i -r \
+               -e '/^CFLAGS/d' \
+               -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
+               -e '/^STRIP/s:=.*:=true:' \
+               -e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
+               -e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
+               -e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
+               -e 's:LF2 = -s:LF2 = :' \
+               -e 's:LF = :LF = $(LDFLAGS) :' \
+               -e 's:SL = :SL = $(LDFLAGS) :' \
+               -e 's:FL = :FL = $(LDFLAGS) :' \
+               -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
+               -e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
+               unix/Makefile \
+               || die "sed unix/Makefile failed"
+
+       # Delete bundled code to make sure we don't use it.
+       rm -r bzip2 || die
+
+       eapply_user
+}
+
+src_configure() {
+       case ${CHOST} in
+               i?86*-*linux*)       TARGET="linux_asm" ;;
+               *linux*)             TARGET="linux_noasm" ;;
+               i?86*-*bsd* | \
+               i?86*-dragonfly*)    TARGET="freebsd" ;; # mislabelled bsd with 
x86 asm
+               *bsd* | *dragonfly*) TARGET="bsd" ;;
+               *-darwin*)           TARGET="macosx" ;;
+               *-solaris*)          TARGET="generic" ;;
+               *-cygwin*)           TARGET="generic" ;;
+               *) die "Unknown target; please update the ebuild to handle 
${CHOST}     " ;;
+       esac
+
+       [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
+       use bzip2 && append-cppflags -DUSE_BZIP2
+       use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR 
-DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
+       append-cppflags -DLARGE_FILE_SUPPORT #281473
+}
+
+src_compile() {
+       ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
+               emake -f unix/Makefile ${TARGET}
+}
+
+src_install() {
+       dobin unzip funzip unzipsfx unix/zipgrep
+       dosym unzip /usr/bin/zipinfo
+       doman man/*.1
+       dodoc BUGS History* README ToDo WHERE
+}

Reply via email to