Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
Date: Tue, 21 Nov 2017 13:52:21
Message-Id: 1511272334.6217fe01d52c2cd1eed967bfc5cd13b9880b95e1.jer@gentoo
1 commit: 6217fe01d52c2cd1eed967bfc5cd13b9880b95e1
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 21 13:51:56 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 21 13:52:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6217fe01
7
8 app-arch/unzip: Version bump.
9
10 Package-Manager: Portage-2.3.14, Repoman-2.3.6
11
12 app-arch/unzip/Manifest | 1 +
13 app-arch/unzip/unzip-6.0_p21.ebuild | 85 +++++++++++++++++++++++++++++++++++++
14 2 files changed, 86 insertions(+)
15
16 diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
17 index f7a457161cb..8296fa70277 100644
18 --- a/app-arch/unzip/Manifest
19 +++ b/app-arch/unzip/Manifest
20 @@ -1,2 +1,3 @@
21 DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d WHIRLPOOL eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808
22 DIST unzip_6.0-20.debian.tar.xz 16680 SHA256 7ddfafb1a771ae8d6b4e25c5e31f22c717e0fe606b1bafadcdd574c01f671490 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe WHIRLPOOL ea5ebd5d95638ff8cd2e91eb77f5be544e33ac6fd478aa00c04da193cd3fad980c5ac1975dfedb2c242192cee6c4eee8bbaf3581299f6c3fa45faa639f0169fd
23 +DIST unzip_6.0-21.debian.tar.xz 17740 SHA256 8accd9d214630a366476437a3ec1842f2e057fdce16042a7b19ee569c33490a3 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36 WHIRLPOOL ce4d74e27ff27183989c680ef022328915c8ade5c1f12b39bcc1ee905dbd2fd3974cbb22da9bed40d8dc7a59de9ba768bfc6bb61d3bdd1b6f571945d06bf19f6
24
25 diff --git a/app-arch/unzip/unzip-6.0_p21.ebuild b/app-arch/unzip/unzip-6.0_p21.ebuild
26 new file mode 100644
27 index 00000000000..f86d5ebbf5b
28 --- /dev/null
29 +++ b/app-arch/unzip/unzip-6.0_p21.ebuild
30 @@ -0,0 +1,85 @@
31 +# Copyright 1999-2017 Gentoo Foundation
32 +# Distributed under the terms of the GNU General Public License v2
33 +
34 +EAPI="6"
35 +
36 +inherit eutils toolchain-funcs flag-o-matic
37 +
38 +MY_PV="${PV//.}"
39 +MY_PV="${MY_PV%_p*}"
40 +MY_P="${PN}${MY_PV}"
41 +
42 +DESCRIPTION="unzipper for pkzip-compressed files"
43 +HOMEPAGE="http://www.info-zip.org/"
44 +SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
45 + mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
46 +
47 +LICENSE="Info-ZIP"
48 +SLOT="0"
49 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
50 +IUSE="bzip2 natspec unicode"
51 +
52 +DEPEND="bzip2? ( app-arch/bzip2 )
53 + natspec? ( dev-libs/libnatspec )"
54 +RDEPEND="${DEPEND}"
55 +
56 +S="${WORKDIR}/${MY_P}"
57 +
58 +src_prepare() {
59 + local deb="${WORKDIR}"/debian/patches
60 + rm "${deb}"/02-this-is-debian-unzip.patch || die
61 + eapply "${deb}"/*.patch
62 +
63 + eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
64 + use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
65 + sed -i -r \
66 + -e '/^CFLAGS/d' \
67 + -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
68 + -e '/^STRIP/s:=.*:=true:' \
69 + -e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
70 + -e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
71 + -e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
72 + -e 's:LF2 = -s:LF2 = :' \
73 + -e 's:LF = :LF = $(LDFLAGS) :' \
74 + -e 's:SL = :SL = $(LDFLAGS) :' \
75 + -e 's:FL = :FL = $(LDFLAGS) :' \
76 + -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
77 + -e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
78 + unix/Makefile \
79 + || die "sed unix/Makefile failed"
80 +
81 + # Delete bundled code to make sure we don't use it.
82 + rm -r bzip2 || die
83 +
84 + eapply_user
85 +}
86 +
87 +src_configure() {
88 + case ${CHOST} in
89 + i?86*-*linux*) TARGET="linux_asm" ;;
90 + *linux*) TARGET="linux_noasm" ;;
91 + i?86*-*bsd* | \
92 + i?86*-dragonfly*) TARGET="freebsd" ;; # mislabelled bsd with x86 asm
93 + *bsd* | *dragonfly*) TARGET="bsd" ;;
94 + *-darwin*) TARGET="macosx" ;;
95 + *-cygwin*) TARGET="cygwin" ;;
96 + *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;;
97 + esac
98 +
99 + [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
100 + use bzip2 && append-cppflags -DUSE_BZIP2
101 + use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
102 + append-cppflags -DLARGE_FILE_SUPPORT #281473
103 +}
104 +
105 +src_compile() {
106 + ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
107 + emake -f unix/Makefile ${TARGET}
108 +}
109 +
110 +src_install() {
111 + dobin unzip funzip unzipsfx unix/zipgrep
112 + dosym unzip /usr/bin/zipinfo
113 + doman man/*.1
114 + dodoc BUGS History* README ToDo WHERE
115 +}