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