Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
Date: Thu, 11 Apr 2019 11:40:42
Message-Id: 1554982832.e9354176a82b0c5556e149f6ca068da873085eae.polynomial-c@gentoo
1 commit: e9354176a82b0c5556e149f6ca068da873085eae
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 11 11:40:00 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 11 11:40:32 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9354176
7
8 sys-libs/zlib: Removed old.
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-libs/zlib/zlib-1.2.11-r1.ebuild | 122 ------------------------------------
14 sys-libs/zlib/zlib-1.2.11.ebuild | 120 -----------------------------------
15 2 files changed, 242 deletions(-)
16
17 diff --git a/sys-libs/zlib/zlib-1.2.11-r1.ebuild b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
18 deleted file mode 100644
19 index aeddd1a694d..00000000000
20 --- a/sys-libs/zlib/zlib-1.2.11-r1.ebuild
21 +++ /dev/null
22 @@ -1,122 +0,0 @@
23 -# Copyright 1999-2018 Gentoo Foundation
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=5
27 -AUTOTOOLS_AUTO_DEPEND="no"
28 -
29 -inherit autotools toolchain-funcs multilib multilib-minimal
30 -
31 -DESCRIPTION="Standard (de)compression library"
32 -HOMEPAGE="https://zlib.net/"
33 -SRC_URI="https://zlib.net/${P}.tar.gz
34 - http://www.gzip.org/zlib/${P}.tar.gz
35 - http://www.zlib.net/current/beta/${P}.tar.gz"
36 -
37 -LICENSE="ZLIB"
38 -SLOT="0/1" # subslot = SONAME
39 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
40 -IUSE="minizip static-libs"
41 -
42 -DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
43 -RDEPEND="!<dev-libs/libxml2-2.7.7" #309623
44 -
45 -src_prepare() {
46 - epatch "${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch
47 -
48 - if use minizip ; then
49 - cd contrib/minizip || die
50 - eautoreconf
51 - fi
52 -
53 - case ${CHOST} in
54 - *-mingw*|mingw*)
55 - # uses preconfigured Makefile rather than configure script
56 - multilib_copy_sources
57 - ;;
58 - esac
59 -}
60 -
61 -echoit() { echo "$@"; "$@"; }
62 -
63 -multilib_src_configure() {
64 - case ${CHOST} in
65 - *-mingw*|mingw*)
66 - ;;
67 - *) # not an autoconf script, so can't use econf
68 - local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
69 - echoit "${S}"/configure \
70 - --shared \
71 - --prefix="${EPREFIX}/usr" \
72 - --libdir="${EPREFIX}/usr/$(get_libdir)" \
73 - ${uname:+--uname=${uname}} \
74 - || die
75 - ;;
76 - esac
77 -
78 - if use minizip ; then
79 - local minizipdir="contrib/minizip"
80 - mkdir -p "${BUILD_DIR}/${minizipdir}" || die
81 - cd ${minizipdir} || die
82 - ECONF_SOURCE="${S}/${minizipdir}" \
83 - econf $(use_enable static-libs static)
84 - fi
85 -}
86 -
87 -multilib_src_compile() {
88 - case ${CHOST} in
89 - *-mingw*|mingw*)
90 - emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
91 - sed \
92 - -e 's|@prefix@|/usr|g' \
93 - -e 's|@exec_prefix@|${prefix}|g' \
94 - -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
95 - -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
96 - -e 's|@includedir@|${prefix}/include|g' \
97 - -e 's|@VERSION@|'${PV}'|g' \
98 - zlib.pc.in > zlib.pc || die
99 - ;;
100 - *)
101 - emake
102 - ;;
103 - esac
104 - use minizip && emake -C contrib/minizip
105 -}
106 -
107 -sed_macros() {
108 - # clean up namespace a little #383179
109 - # we do it here so we only have to tweak 2 files
110 - sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
111 -}
112 -
113 -multilib_src_install() {
114 - case ${CHOST} in
115 - *-mingw*|mingw*)
116 - emake -f win32/Makefile.gcc install \
117 - BINARY_PATH="${ED}/usr/bin" \
118 - LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
119 - INCLUDE_PATH="${ED}/usr/include" \
120 - SHARED_MODE=1
121 - # overwrites zlib.pc created from win32/Makefile.gcc #620136
122 - insinto /usr/$(get_libdir)/pkgconfig
123 - doins zlib.pc
124 - ;;
125 -
126 - *)
127 - emake install DESTDIR="${D}" LDCONFIG=:
128 - gen_usr_ldscript -a z
129 - ;;
130 - esac
131 - sed_macros "${ED}"/usr/include/*.h
132 -
133 - if use minizip ; then
134 - emake -C contrib/minizip install DESTDIR="${D}"
135 - sed_macros "${ED}"/usr/include/minizip/*.h
136 - fi
137 -
138 - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645
139 -}
140 -
141 -multilib_src_install_all() {
142 - dodoc FAQ README ChangeLog doc/*.txt
143 - use minizip && dodoc contrib/minizip/*.txt
144 -}
145
146 diff --git a/sys-libs/zlib/zlib-1.2.11.ebuild b/sys-libs/zlib/zlib-1.2.11.ebuild
147 deleted file mode 100644
148 index a7d2cb8d2a9..00000000000
149 --- a/sys-libs/zlib/zlib-1.2.11.ebuild
150 +++ /dev/null
151 @@ -1,120 +0,0 @@
152 -# Copyright 1999-2018 Gentoo Foundation
153 -# Distributed under the terms of the GNU General Public License v2
154 -
155 -EAPI=5
156 -AUTOTOOLS_AUTO_DEPEND="no"
157 -
158 -inherit autotools toolchain-funcs multilib multilib-minimal
159 -
160 -DESCRIPTION="Standard (de)compression library"
161 -HOMEPAGE="https://zlib.net/"
162 -SRC_URI="https://zlib.net/${P}.tar.gz
163 - http://www.gzip.org/zlib/${P}.tar.gz
164 - http://www.zlib.net/current/beta/${P}.tar.gz"
165 -
166 -LICENSE="ZLIB"
167 -SLOT="0/1" # subslot = SONAME
168 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
169 -IUSE="minizip static-libs"
170 -
171 -DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
172 -RDEPEND="!<dev-libs/libxml2-2.7.7" #309623
173 -
174 -src_prepare() {
175 - if use minizip ; then
176 - cd contrib/minizip || die
177 - eautoreconf
178 - fi
179 -
180 - case ${CHOST} in
181 - *-mingw*|mingw*)
182 - # uses preconfigured Makefile rather than configure script
183 - multilib_copy_sources
184 - ;;
185 - esac
186 -}
187 -
188 -echoit() { echo "$@"; "$@"; }
189 -
190 -multilib_src_configure() {
191 - case ${CHOST} in
192 - *-mingw*|mingw*)
193 - ;;
194 - *) # not an autoconf script, so can't use econf
195 - local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
196 - echoit "${S}"/configure \
197 - --shared \
198 - --prefix="${EPREFIX}/usr" \
199 - --libdir="${EPREFIX}/usr/$(get_libdir)" \
200 - ${uname:+--uname=${uname}} \
201 - || die
202 - ;;
203 - esac
204 -
205 - if use minizip ; then
206 - local minizipdir="contrib/minizip"
207 - mkdir -p "${BUILD_DIR}/${minizipdir}" || die
208 - cd ${minizipdir} || die
209 - ECONF_SOURCE="${S}/${minizipdir}" \
210 - econf $(use_enable static-libs static)
211 - fi
212 -}
213 -
214 -multilib_src_compile() {
215 - case ${CHOST} in
216 - *-mingw*|mingw*)
217 - emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
218 - sed \
219 - -e 's|@prefix@|/usr|g' \
220 - -e 's|@exec_prefix@|${prefix}|g' \
221 - -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
222 - -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
223 - -e 's|@includedir@|${prefix}/include|g' \
224 - -e 's|@VERSION@|'${PV}'|g' \
225 - zlib.pc.in > zlib.pc || die
226 - ;;
227 - *)
228 - emake
229 - ;;
230 - esac
231 - use minizip && emake -C contrib/minizip
232 -}
233 -
234 -sed_macros() {
235 - # clean up namespace a little #383179
236 - # we do it here so we only have to tweak 2 files
237 - sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
238 -}
239 -
240 -multilib_src_install() {
241 - case ${CHOST} in
242 - *-mingw*|mingw*)
243 - emake -f win32/Makefile.gcc install \
244 - BINARY_PATH="${ED}/usr/bin" \
245 - LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
246 - INCLUDE_PATH="${ED}/usr/include" \
247 - SHARED_MODE=1
248 - # overwrites zlib.pc created from win32/Makefile.gcc #620136
249 - insinto /usr/$(get_libdir)/pkgconfig
250 - doins zlib.pc
251 - ;;
252 -
253 - *)
254 - emake install DESTDIR="${D}" LDCONFIG=:
255 - gen_usr_ldscript -a z
256 - ;;
257 - esac
258 - sed_macros "${ED}"/usr/include/*.h
259 -
260 - if use minizip ; then
261 - emake -C contrib/minizip install DESTDIR="${D}"
262 - sed_macros "${ED}"/usr/include/minizip/*.h
263 - fi
264 -
265 - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645
266 -}
267 -
268 -multilib_src_install_all() {
269 - dodoc FAQ README ChangeLog doc/*.txt
270 - use minizip && dodoc contrib/minizip/*.txt
271 -}