Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-arch/zip: zip-3.0-r2.ebuild ChangeLog
Date: Sun, 05 Jan 2014 18:26:19
Message-Id: 20140105182615.6C1272004C@flycatcher.gentoo.org
1 vapier 14/01/05 18:26:15
2
3 Modified: ChangeLog
4 Added: zip-3.0-r2.ebuild
5 Log:
6 Handle running configure ourselves and be stricter with feature flags so they are respected #435410 by Ambroz Bizjak.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
9
10 Revision Changes Path
11 1.102 app-arch/zip/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/zip/ChangeLog?rev=1.102&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/zip/ChangeLog?rev=1.102&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/zip/ChangeLog?r1=1.101&r2=1.102
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v
20 retrieving revision 1.101
21 retrieving revision 1.102
22 diff -u -r1.101 -r1.102
23 --- ChangeLog 18 Feb 2013 22:42:54 -0000 1.101
24 +++ ChangeLog 5 Jan 2014 18:26:15 -0000 1.102
25 @@ -1,6 +1,12 @@
26 # ChangeLog for app-arch/zip
27 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.101 2013/02/18 22:42:54 zmedico Exp $
29 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.102 2014/01/05 18:26:15 vapier Exp $
31 +
32 +*zip-3.0-r2 (05 Jan 2014)
33 +
34 + 05 Jan 2014; Mike Frysinger <vapier@g.o> +zip-3.0-r2.ebuild:
35 + Handle running configure ourselves and be stricter with feature flags so they
36 + are respected #435410 by Ambroz Bizjak.
37
38 18 Feb 2013; Zac Medico <zmedico@g.o> zip-3.0-r1.ebuild:
39 Add ~arm-linux keyword.
40
41
42
43 1.1 app-arch/zip/zip-3.0-r2.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/zip/zip-3.0-r2.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/zip/zip-3.0-r2.ebuild?rev=1.1&content-type=text/plain
47
48 Index: zip-3.0-r2.ebuild
49 ===================================================================
50 # Copyright 1999-2014 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-3.0-r2.ebuild,v 1.1 2014/01/05 18:26:15 vapier Exp $
53
54 EAPI="4"
55 inherit toolchain-funcs eutils flag-o-matic
56
57 MY_P="${PN}${PV//.}"
58 DESCRIPTION="Info ZIP (encryption support)"
59 HOMEPAGE="http://www.info-zip.org/"
60 SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
61
62 LICENSE="Info-ZIP"
63 SLOT="0"
64 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux"
65 IUSE="bzip2 crypt natspec unicode"
66
67 RDEPEND="bzip2? ( app-arch/bzip2 )
68 natspec? ( dev-libs/libnatspec )"
69 DEPEND="${RDEPEND}
70 app-arch/unzip"
71
72 S=${WORKDIR}/${MY_P}
73
74 src_prepare() {
75 epatch "${FILESDIR}"/${PN}-3.0-no-crypt.patch #238398
76 epatch "${FILESDIR}"/${PN}-3.0-pic.patch
77 epatch "${FILESDIR}"/${PN}-3.0-exec-stack.patch
78 epatch "${FILESDIR}"/${PN}-3.0-build.patch
79 use natspec && epatch "${FILESDIR}"/${PN}-3.0-natspec.patch #275244
80 }
81
82 src_configure() {
83 append-cppflags \
84 -DLARGE_FILE_SUPPORT \
85 -DUIDGID_NOT_16BIT \
86 -D$(usex bzip2 '' NO)BZIP2_SUPPORT \
87 -D$(usex crypt '' NO)CRYPT \
88 -D$(usex unicode '' NO)UNICODE_SUPPORT
89 # Third arg disables bzip2 logic as we handle it ourselves above.
90 sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
91 if use bzip2 ; then
92 sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
93 fi
94 }
95
96 src_compile() {
97 emake \
98 CPP="$(tc-getCPP)" \
99 -f unix/Makefile generic
100 }
101
102 src_install() {
103 dobin zip zipnote zipsplit
104 doman man/zip{,note,split}.1
105 if use crypt ; then
106 dobin zipcloak
107 doman man/zipcloak.1
108 fi
109 dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
110 }