1 |
commit: 2003ec0bfbd2d130e55f49362bd8b587883d8bee |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 18 16:28:47 2023 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 18 16:29:06 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2003ec0b |
7 |
|
8 |
dev-libs/apr-util: drop 1.6.1-r10 |
9 |
|
10 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
11 |
|
12 |
dev-libs/apr-util/Manifest | 1 - |
13 |
dev-libs/apr-util/apr-util-1.6.1-r10.ebuild | 148 ---------------------------- |
14 |
2 files changed, 149 deletions(-) |
15 |
|
16 |
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest |
17 |
index 5f545419d548..55721b0e12da 100644 |
18 |
--- a/dev-libs/apr-util/Manifest |
19 |
+++ b/dev-libs/apr-util/Manifest |
20 |
@@ -1,2 +1 @@ |
21 |
-DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d |
22 |
DIST apr-util-1.6.3.tar.bz2 432692 BLAKE2B 5eb56c45ba9d87ff3e3769439a3a9a858a1947de68b34892c729f39736fc41117a41c630c3c4cfb07b444c4ee0d5853ec5be158e8fa0b0c0ab89f0cb51cc9c6d SHA512 8050a481eeda7532ef3751dbd8a5aa6c48354d52904a856ef9709484f4b0cc2e022661c49ddf55ec58253db22708ee0607dfa7705d9270e8fee117ae4f06a0fe |
23 |
|
24 |
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild |
25 |
deleted file mode 100644 |
26 |
index ff0412e3d5fc..000000000000 |
27 |
--- a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild |
28 |
+++ /dev/null |
29 |
@@ -1,148 +0,0 @@ |
30 |
-# Copyright 1999-2022 Gentoo Authors |
31 |
-# Distributed under the terms of the GNU General Public License v2 |
32 |
- |
33 |
-EAPI=7 |
34 |
- |
35 |
-# Usually apr-util has the same PV as apr, but in case of security fixes, this may change. |
36 |
-# APR_PV="${PV}" |
37 |
-APR_PV="1.7.0-r6" |
38 |
- |
39 |
-inherit autotools db-use libtool multilib toolchain-funcs |
40 |
- |
41 |
-DESCRIPTION="Apache Portable Runtime Utility Library" |
42 |
-HOMEPAGE="https://apr.apache.org/" |
43 |
-SRC_URI="mirror://apache/apr/${P}.tar.bz2" |
44 |
- |
45 |
-LICENSE="Apache-2.0" |
46 |
-SLOT="1" |
47 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
48 |
-IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs" |
49 |
-#RESTRICT="test" |
50 |
- |
51 |
-RDEPEND=" |
52 |
- >=dev-libs/apr-${APR_PV}:1= |
53 |
- dev-libs/expat |
54 |
- virtual/libcrypt:= |
55 |
- berkdb? ( >=sys-libs/db-4:= ) |
56 |
- gdbm? ( sys-libs/gdbm:= ) |
57 |
- ldap? ( net-nds/openldap:= ) |
58 |
- mysql? ( || ( |
59 |
- dev-db/mariadb-connector-c |
60 |
- >=dev-db/mysql-connector-c-8 |
61 |
- ) ) |
62 |
- nss? ( dev-libs/nss ) |
63 |
- odbc? ( dev-db/unixODBC ) |
64 |
- openssl? ( |
65 |
- dev-libs/openssl:0= |
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 |
- "${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch |
81 |
- "${FILESDIR}"/${PN}-1.6.1-libtool.patch # 779487 |
82 |
- "${FILESDIR}"/${PN}-1.6.1-mariadb-support.patch |
83 |
- "${FILESDIR}"/${PN}-1.6.1-my_bool.patch |
84 |
- "${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch |
85 |
-) |
86 |
- |
87 |
-src_prepare() { |
88 |
- default |
89 |
- |
90 |
- # Fix usage of libmysqlclient (bug #620230) |
91 |
- grep -lrF "libmysqlclient_r" "${S}" \ |
92 |
- | xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \ |
93 |
- || die |
94 |
- |
95 |
- mv configure.{in,ac} || die |
96 |
- eautoreconf |
97 |
- elibtoolize |
98 |
-} |
99 |
- |
100 |
-src_configure() { |
101 |
- local myconf=( |
102 |
- --datadir="${EPREFIX}"/usr/share/apr-util-1 |
103 |
- --with-apr="${ESYSROOT}"/usr |
104 |
- --with-expat="${EPREFIX}"/usr |
105 |
- --without-sqlite2 |
106 |
- $(use_with gdbm) |
107 |
- $(use_with ldap) |
108 |
- $(use_with mysql) |
109 |
- $(use_with nss) |
110 |
- $(use_with odbc) |
111 |
- $(use_with openssl) |
112 |
- $(use_with postgres pgsql) |
113 |
- $(use_with sqlite sqlite3) |
114 |
- ) |
115 |
- |
116 |
- tc-is-static-only && myconf+=( --disable-util-dso ) |
117 |
- |
118 |
- if use berkdb; then |
119 |
- local db_version |
120 |
- db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version" |
121 |
- db_version="$(db_ver_to_slot "${db_version}")" |
122 |
- db_version="${db_version/\./}" |
123 |
- myconf+=( |
124 |
- --with-dbm=db${db_version} |
125 |
- # We use $T for the libdir because otherwise it'd simply be the normal |
126 |
- # system libdir. That's pointless as the compiler will search it for |
127 |
- # us already. This makes cross-compiling and such easier. |
128 |
- --with-berkeley-db="$(db_includedir 2>/dev/null):${T}" |
129 |
- ) |
130 |
- else |
131 |
- myconf+=( --without-berkeley-db ) |
132 |
- fi |
133 |
- |
134 |
- if use nss || use openssl ; then |
135 |
- myconf+=( --with-crypto ) # 518708 |
136 |
- fi |
137 |
- |
138 |
- econf "${myconf[@]}" |
139 |
- # Use the current env build settings rather than whatever apr was built with. |
140 |
- sed -i -r \ |
141 |
- -e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \ |
142 |
- -e "/^CC=/s:=.*:=$(tc-getCC):" \ |
143 |
- -e '/^(C|CPP|CXX|LD)FLAGS=/d' \ |
144 |
- -e '/^LTFLAGS/s:--silent::' \ |
145 |
- build/rules.mk || die |
146 |
-} |
147 |
- |
148 |
-src_compile() { |
149 |
- emake |
150 |
- use doc && emake dox |
151 |
-} |
152 |
- |
153 |
-src_test() { |
154 |
- # Building tests in parallel is broken |
155 |
- emake -j1 check |
156 |
-} |
157 |
- |
158 |
-src_install() { |
159 |
- default |
160 |
- |
161 |
- find "${ED}" -name "*.la" -delete || die |
162 |
- if [[ -d "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then |
163 |
- find "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die |
164 |
- fi |
165 |
- if ! use static-libs ; then |
166 |
- find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die |
167 |
- fi |
168 |
- |
169 |
- if use doc ; then |
170 |
- docinto html |
171 |
- dodoc -r docs/dox/html/* |
172 |
- fi |
173 |
- |
174 |
- # This file is only used on AIX systems, which Gentoo is not, |
175 |
- # and causes collisions between the SLOTs, so remove it. |
176 |
- rm "${ED}/usr/$(get_libdir)/aprutil.exp" || die |
177 |
-} |