Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
Date: Fri, 28 Aug 2015 00:30:53
Message-Id: 1440721829.9316a916d4f1478b26b8b9b9f2e82940b8b54bf2.mrueg@gentoo
1 commit: 9316a916d4f1478b26b8b9b9f2e82940b8b54bf2
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 28 00:30:29 2015 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 28 00:30:29 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9316a916
7
8 app-arch/unzip: Remove old
9
10 Package-Manager: portage-2.2.20.1
11
12 app-arch/unzip/unzip-6.0-r1.ebuild | 70 -------------------------------------
13 app-arch/unzip/unzip-6.0-r2.ebuild | 71 --------------------------------------
14 2 files changed, 141 deletions(-)
15
16 diff --git a/app-arch/unzip/unzip-6.0-r1.ebuild b/app-arch/unzip/unzip-6.0-r1.ebuild
17 deleted file mode 100644
18 index cdb7572..0000000
19 --- a/app-arch/unzip/unzip-6.0-r1.ebuild
20 +++ /dev/null
21 @@ -1,70 +0,0 @@
22 -# Copyright 1999-2010 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -# $Id$
25 -
26 -inherit eutils toolchain-funcs flag-o-matic
27 -
28 -MY_P="${PN}${PV/.}"
29 -
30 -DESCRIPTION="unzipper for pkzip-compressed files"
31 -HOMEPAGE="http://www.info-zip.org/"
32 -SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz"
33 -
34 -LICENSE="Info-ZIP"
35 -SLOT="0"
36 -KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ppc ppc64 s390 sh ~sparc x86"
37 -IUSE="bzip2 unicode"
38 -
39 -DEPEND="bzip2? ( app-arch/bzip2 )"
40 -RDEPEND="${DEPEND}"
41 -
42 -S="${WORKDIR}/${MY_P}"
43 -
44 -src_unpack() {
45 - unpack ${A}
46 - cd "${S}"
47 - epatch "${FILESDIR}"/${P}-no-exec-stack.patch
48 - sed -i \
49 - -e '/^CFLAGS/d' \
50 - -e '/CFLAGS/s:-O[0-9]\?:$(CFLAGS) $(CPPFLAGS):' \
51 - -e '/^STRIP/s:=.*:=true:' \
52 - -e "s:\<CC=gcc\>:CC=\"$(tc-getCC)\":" \
53 - -e "s:\<LD=gcc\>:LD=\"$(tc-getCC)\":" \
54 - -e "s:\<AS=gcc\>:AS=\"$(tc-getCC)\":" \
55 - -e 's:LF2 = -s:LF2 = :' \
56 - -e 's:LF = :LF = $(LDFLAGS) :' \
57 - -e 's:SL = :SL = $(LDFLAGS) :' \
58 - -e 's:FL = :FL = $(LDFLAGS) :' \
59 - -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
60 - unix/Makefile \
61 - || die "sed unix/Makefile failed"
62 -}
63 -
64 -src_compile() {
65 - local TARGET
66 - case ${CHOST} in
67 - i?86*-*linux*) TARGET=linux_asm ;;
68 - *linux*) TARGET=linux_noasm ;;
69 - i?86*-*bsd* | \
70 - i?86*-dragonfly*) TARGET=freebsd ;; # mislabelled bsd with x86 asm
71 - *bsd* | *dragonfly*) TARGET=bsd ;;
72 - *-darwin*) TARGET=macosx ;;
73 - *) die "Unknown target, you suck" ;;
74 - esac
75 -
76 - [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
77 - use bzip2 && append-cppflags -DUSE_BZIP2
78 - use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
79 - append-cppflags -DLARGE_FILE_SUPPORT #281473
80 -
81 - emake \
82 - -f unix/Makefile \
83 - ${TARGET} || die "emake failed"
84 -}
85 -
86 -src_install() {
87 - dobin unzip funzip unzipsfx unix/zipgrep || die "dobin failed"
88 - dosym unzip /usr/bin/zipinfo || die
89 - doman man/*.1
90 - dodoc BUGS History* README ToDo WHERE
91 -}
92
93 diff --git a/app-arch/unzip/unzip-6.0-r2.ebuild b/app-arch/unzip/unzip-6.0-r2.ebuild
94 deleted file mode 100644
95 index 1d350a1..0000000
96 --- a/app-arch/unzip/unzip-6.0-r2.ebuild
97 +++ /dev/null
98 @@ -1,71 +0,0 @@
99 -# Copyright 1999-2011 Gentoo Foundation
100 -# Distributed under the terms of the GNU General Public License v2
101 -# $Id$
102 -
103 -EAPI="2"
104 -inherit eutils toolchain-funcs flag-o-matic
105 -
106 -MY_P="${PN}${PV/.}"
107 -
108 -DESCRIPTION="unzipper for pkzip-compressed files"
109 -HOMEPAGE="http://www.info-zip.org/"
110 -SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz"
111 -
112 -LICENSE="Info-ZIP"
113 -SLOT="0"
114 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
115 -IUSE="bzip2 natspec unicode"
116 -
117 -DEPEND="bzip2? ( app-arch/bzip2 )
118 - natspec? ( dev-libs/libnatspec )"
119 -RDEPEND="${DEPEND}"
120 -
121 -S="${WORKDIR}/${MY_P}"
122 -
123 -src_prepare() {
124 - epatch "${FILESDIR}"/${P}-no-exec-stack.patch
125 - use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
126 - sed -i \
127 - -e '/^CFLAGS/d' \
128 - -e '/CFLAGS/s:-O[0-9]\?:$(CFLAGS) $(CPPFLAGS):' \
129 - -e '/^STRIP/s:=.*:=true:' \
130 - -e "s:\<CC=gcc\>:CC=\"$(tc-getCC)\":" \
131 - -e "s:\<LD=gcc\>:LD=\"$(tc-getCC)\":" \
132 - -e "s:\<AS=gcc\>:AS=\"$(tc-getCC)\":" \
133 - -e 's:LF2 = -s:LF2 = :' \
134 - -e 's:LF = :LF = $(LDFLAGS) :' \
135 - -e 's:SL = :SL = $(LDFLAGS) :' \
136 - -e 's:FL = :FL = $(LDFLAGS) :' \
137 - -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
138 - unix/Makefile \
139 - || die "sed unix/Makefile failed"
140 -}
141 -
142 -src_compile() {
143 - local TARGET
144 - case ${CHOST} in
145 - i?86*-*linux*) TARGET=linux_asm ;;
146 - *linux*) TARGET=linux_noasm ;;
147 - i?86*-*bsd* | \
148 - i?86*-dragonfly*) TARGET=freebsd ;; # mislabelled bsd with x86 asm
149 - *bsd* | *dragonfly*) TARGET=bsd ;;
150 - *-darwin*) TARGET=macosx ;;
151 - *) die "Unknown target, you suck" ;;
152 - esac
153 -
154 - [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
155 - use bzip2 && append-cppflags -DUSE_BZIP2
156 - use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
157 - append-cppflags -DLARGE_FILE_SUPPORT #281473
158 -
159 - emake \
160 - -f unix/Makefile \
161 - ${TARGET} || die "emake failed"
162 -}
163 -
164 -src_install() {
165 - dobin unzip funzip unzipsfx unix/zipgrep || die "dobin failed"
166 - dosym unzip /usr/bin/zipinfo || die
167 - doman man/*.1
168 - dodoc BUGS History* README ToDo WHERE
169 -}