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