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: dev-libs/apr-util/
Date: Wed, 01 Jan 2020 11:50:59
Message-Id: 1577879441.e83193d3333b03b10a7e8ef76a5cb4322e3d3050.polynomial-c@gentoo
1 commit: e83193d3333b03b10a7e8ef76a5cb4322e3d3050
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 1 11:50:41 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 1 11:50:41 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e83193d3
7
8 dev-libs/apr-util: Removed old
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-libs/apr-util/Manifest | 1 -
14 dev-libs/apr-util/apr-util-1.5.4-r3.ebuild | 139 -----------------------------
15 dev-libs/apr-util/apr-util-1.5.4.ebuild | 112 -----------------------
16 3 files changed, 252 deletions(-)
17
18 diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
19 index 268dd4fa414..3759f954dca 100644
20 --- a/dev-libs/apr-util/Manifest
21 +++ b/dev-libs/apr-util/Manifest
22 @@ -1,2 +1 @@
23 -DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a35c9b2ea67323edde52c88e4affc0ea0a25a0a64f42c82f0927482d22dc6049286df8cb6048f8bbb61659beb0ac SHA512 ca877d8e444218c4ba0f28063ee075ddcd6c0a487b692dc80ef442fe775ec4eeb337c6957853772e8082e27edcb450d7e909c2c6c3ab4a95bbf0a5ee5ea4a2d1
24 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
25
26 diff --git a/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
27 deleted file mode 100644
28 index 05a79fc756d..00000000000
29 --- a/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
30 +++ /dev/null
31 @@ -1,139 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
38 -# APR_PV="${PV}"
39 -APR_PV="1.5.2"
40 -
41 -inherit autotools db-use eutils libtool multilib toolchain-funcs
42 -
43 -DESCRIPTION="Apache Portable Runtime Utility Library"
44 -HOMEPAGE="http://apr.apache.org/"
45 -SRC_URI="mirror://apache/apr/${P}.tar.bz2"
46 -
47 -LICENSE="Apache-2.0"
48 -SLOT="1"
49 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
50 -IUSE="berkdb doc freetds gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
51 -#RESTRICT="test"
52 -
53 -RDEPEND="
54 - dev-libs/expat
55 - >=dev-libs/apr-${APR_PV}:1
56 - berkdb? ( >=sys-libs/db-4:= )
57 - freetds? ( dev-db/freetds )
58 - gdbm? ( sys-libs/gdbm:= )
59 - ldap? ( =net-nds/openldap-2* )
60 - mysql? ( =virtual/mysql-5* )
61 - nss? ( dev-libs/nss )
62 - odbc? ( dev-db/unixODBC )
63 - openssl? (
64 - !libressl? ( dev-libs/openssl:0= )
65 - libressl? ( dev-libs/libressl )
66 - )
67 - postgres? ( dev-db/postgresql:= )
68 - sqlite? ( dev-db/sqlite:3 )
69 -"
70 -DEPEND="
71 - ${RDEPEND}
72 - >=sys-devel/libtool-2.4.2
73 - doc? ( app-doc/doxygen )
74 -"
75 -
76 -DOCS=(CHANGES NOTICE README)
77 -
78 -PATCHES=(
79 - "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
80 -)
81 -
82 -src_prepare() {
83 - default
84 -
85 - # Fix usage of libmysqlclient (bug #620230)
86 - grep -lrF "libmysqlclient_r" "${S}" \
87 - | xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \
88 - || die
89 -
90 - mv configure.{in,ac} || die
91 - eautoreconf
92 - elibtoolize
93 -}
94 -
95 -src_configure() {
96 - local myconf=()
97 -
98 - tc-is-static-only && myconf+=( --disable-util-dso )
99 -
100 - if use berkdb; then
101 - local db_version
102 - db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
103 - db_version="$(db_ver_to_slot "${db_version}")"
104 - db_version="${db_version/\./}"
105 - myconf+=(
106 - --with-dbm=db${db_version}
107 - # We use $T for the libdir because otherwise it'd simply be the normal
108 - # system libdir. That's pointless as the compiler will search it for
109 - # us already. This makes cross-compiling and such easier.
110 - --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
111 - )
112 - else
113 - myconf+=( --without-berkeley-db )
114 - fi
115 -
116 - if use nss || use openssl ; then
117 - myconf+=( --with-crypto ) # 518708
118 - fi
119 -
120 - local myeconfargs=(
121 - --datadir="${EPREFIX}"/usr/share/apr-util-1
122 - --with-apr="${SYSROOT}${EPREFIX}"/usr
123 - --with-expat="${EPREFIX}"/usr
124 - --without-sqlite2
125 - $(use_with freetds)
126 - $(use_with gdbm)
127 - $(use_with ldap)
128 - $(use_with mysql)
129 - $(use_with nss)
130 - $(use_with odbc)
131 - $(use_with openssl)
132 - $(use_with postgres pgsql)
133 - $(use_with sqlite sqlite3)
134 - "${myconf[@]}"
135 - )
136 - econf "${myeconfargs[@]}"
137 - # Use the current env build settings rather than whatever apr was built with.
138 - sed -i -r \
139 - -e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
140 - -e "/^CC=/s:=.*:=$(tc-getCC):" \
141 - -e '/^(C|CPP|CXX|LD)FLAGS=/d' \
142 - -e '/^LTFLAGS/s:--silent::' \
143 - build/rules.mk || die
144 -}
145 -
146 -src_compile() {
147 - emake
148 - use doc && emake dox
149 -}
150 -
151 -src_install() {
152 - default
153 -
154 - find "${ED}" -name "*.la" -delete || die
155 - if [[ -d "${ED}usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
156 - find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
157 - fi
158 - if ! use static-libs ; then
159 - find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die
160 - fi
161 -
162 - if use doc ; then
163 - docinto html
164 - dodoc -r docs/dox/html/*
165 - fi
166 -
167 - # This file is only used on AIX systems, which Gentoo is not,
168 - # and causes collisions between the SLOTs, so remove it.
169 - rm "${ED}usr/$(get_libdir)/aprutil.exp" || die
170 -}
171
172 diff --git a/dev-libs/apr-util/apr-util-1.5.4.ebuild b/dev-libs/apr-util/apr-util-1.5.4.ebuild
173 deleted file mode 100644
174 index ce02048009f..00000000000
175 --- a/dev-libs/apr-util/apr-util-1.5.4.ebuild
176 +++ /dev/null
177 @@ -1,112 +0,0 @@
178 -# Copyright 1999-2018 Gentoo Foundation
179 -# Distributed under the terms of the GNU General Public License v2
180 -
181 -EAPI="4"
182 -
183 -# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
184 -# APR_PV="${PV}"
185 -APR_PV="1.4.6"
186 -
187 -inherit autotools db-use eutils libtool multilib toolchain-funcs
188 -
189 -DESCRIPTION="Apache Portable Runtime Utility Library"
190 -HOMEPAGE="http://apr.apache.org/"
191 -SRC_URI="mirror://apache/apr/${P}.tar.bz2"
192 -
193 -LICENSE="Apache-2.0"
194 -SLOT="1"
195 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
196 -IUSE="berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
197 -#RESTRICT="test"
198 -
199 -RDEPEND="dev-libs/expat
200 - >=dev-libs/apr-${APR_PV}:1
201 - berkdb? ( >=sys-libs/db-4 )
202 - freetds? ( dev-db/freetds )
203 - gdbm? ( sys-libs/gdbm )
204 - ldap? ( =net-nds/openldap-2* )
205 - mysql? ( =virtual/mysql-5* )
206 - nss? ( dev-libs/nss )
207 - odbc? ( dev-db/unixODBC )
208 - openssl? ( dev-libs/openssl )
209 - postgres? ( dev-db/postgresql )
210 - sqlite? ( dev-db/sqlite:3 )"
211 -DEPEND="${RDEPEND}
212 - >=sys-devel/libtool-2.4.2
213 - doc? ( app-doc/doxygen )"
214 -
215 -DOCS=(CHANGES NOTICE README)
216 -
217 -src_prepare() {
218 - epatch "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
219 - eautoreconf
220 - elibtoolize
221 -}
222 -
223 -src_configure() {
224 - local myconf=()
225 -
226 - tc-is-static-only && myconf+=( --disable-util-dso )
227 -
228 - if use berkdb; then
229 - local db_version
230 - db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
231 - db_version="$(db_ver_to_slot "${db_version}")"
232 - db_version="${db_version/\./}"
233 - myconf+=(
234 - --with-dbm=db${db_version}
235 - # We use $T for the libdir because otherwise it'd simply be the normal
236 - # system libdir. That's pointless as the compiler will search it for
237 - # us already. This makes cross-compiling and such easier.
238 - --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
239 - )
240 - else
241 - myconf+=( --without-berkeley-db )
242 - fi
243 -
244 - if use nss || use openssl ; then
245 - myconf+=( --with-crypto ) # 518708
246 - fi
247 -
248 - econf \
249 - --datadir="${EPREFIX}"/usr/share/apr-util-1 \
250 - --with-apr="${SYSROOT}${EPREFIX}"/usr \
251 - --with-expat="${EPREFIX}"/usr \
252 - --without-sqlite2 \
253 - $(use_with freetds) \
254 - $(use_with gdbm) \
255 - $(use_with ldap) \
256 - $(use_with mysql) \
257 - $(use_with nss) \
258 - $(use_with odbc) \
259 - $(use_with openssl) \
260 - $(use_with postgres pgsql) \
261 - $(use_with sqlite sqlite3) \
262 - "${myconf[@]}"
263 - # Use the current env build settings rather than whatever apr was built with.
264 - sed -i -r \
265 - -e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
266 - -e "/^CC=/s:=.*:=$(tc-getCC):" \
267 - -e '/^(C|CPP|CXX|LD)FLAGS=/d' \
268 - -e '/^LTFLAGS/s:--silent::' \
269 - build/rules.mk || die
270 -}
271 -
272 -src_compile() {
273 - emake
274 - use doc && emake dox
275 -}
276 -
277 -src_install() {
278 - default
279 -
280 - find "${ED}" -name "*.la" -delete
281 - find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete
282 - use static-libs || find "${ED}" -name "*.a" -delete
283 -
284 - use doc && dohtml -r docs/dox/html/*
285 -
286 - # This file is only used on AIX systems, which Gentoo is not,
287 - # and causes collisions between the SLOTs, so remove it.
288 - rm -f "${ED}usr/$(get_libdir)/aprutil.exp"
289 -}