1 |
commit: 00fa8db06931fb939b2eea091fbd66d057c19edf |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 4 10:28:28 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 4 10:28:28 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00fa8db0 |
7 |
|
8 |
dev-libs/apr-util: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
dev-libs/apr-util/Manifest | 1 - |
13 |
dev-libs/apr-util/apr-util-1.6.0.ebuild | 135 -------------------------------- |
14 |
2 files changed, 136 deletions(-) |
15 |
|
16 |
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest |
17 |
index 326ea07a490..268dd4fa414 100644 |
18 |
--- a/dev-libs/apr-util/Manifest |
19 |
+++ b/dev-libs/apr-util/Manifest |
20 |
@@ -1,3 +1,2 @@ |
21 |
DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a35c9b2ea67323edde52c88e4affc0ea0a25a0a64f42c82f0927482d22dc6049286df8cb6048f8bbb61659beb0ac SHA512 ca877d8e444218c4ba0f28063ee075ddcd6c0a487b692dc80ef442fe775ec4eeb337c6957853772e8082e27edcb450d7e909c2c6c3ab4a95bbf0a5ee5ea4a2d1 |
22 |
-DIST apr-util-1.6.0.tar.bz2 428750 BLAKE2B 71bb021b1a1a6f64547a7259d0d6aceecfe1dbe571de302e7b00b16ff1f656e088958408a584cf7968e81214ce69412f363f822faf177975f48ba8cd0909fd94 SHA512 dc88c13ef6116ed1c67584436cb8ca94ef77d358cb60c7cafab953d36d00564776414faed43397755e79bcf1b14dfca81cad2e280a2dd4c31f6e4559583effd0 |
23 |
DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d |
24 |
|
25 |
diff --git a/dev-libs/apr-util/apr-util-1.6.0.ebuild b/dev-libs/apr-util/apr-util-1.6.0.ebuild |
26 |
deleted file mode 100644 |
27 |
index ec528c173dd..00000000000 |
28 |
--- a/dev-libs/apr-util/apr-util-1.6.0.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,135 +0,0 @@ |
31 |
-# Copyright 1999-2017 Gentoo Foundation |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=6 |
35 |
- |
36 |
-# Usually apr-util has the same PV as apr, but in case of security fixes, this may change. |
37 |
-# APR_PV="${PV}" |
38 |
-APR_PV="1.6.2" |
39 |
- |
40 |
-inherit autotools db-use eutils libtool multilib toolchain-funcs |
41 |
- |
42 |
-DESCRIPTION="Apache Portable Runtime Utility Library" |
43 |
-HOMEPAGE="http://apr.apache.org/" |
44 |
-SRC_URI="mirror://apache/apr/${P}.tar.bz2" |
45 |
- |
46 |
-LICENSE="Apache-2.0" |
47 |
-SLOT="1" |
48 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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" |
49 |
-IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs" |
50 |
-#RESTRICT="test" |
51 |
- |
52 |
-RDEPEND=" |
53 |
- dev-libs/expat |
54 |
- >=dev-libs/apr-${APR_PV}:1 |
55 |
- berkdb? ( >=sys-libs/db-4:= ) |
56 |
- gdbm? ( sys-libs/gdbm ) |
57 |
- ldap? ( =net-nds/openldap-2* ) |
58 |
- mysql? ( =virtual/mysql-5* ) |
59 |
- nss? ( dev-libs/nss ) |
60 |
- odbc? ( dev-db/unixODBC ) |
61 |
- openssl? ( |
62 |
- !libressl? ( dev-libs/openssl:0 ) |
63 |
- libressl? ( dev-libs/libressl ) |
64 |
- ) |
65 |
- postgres? ( dev-db/postgresql:= ) |
66 |
- sqlite? ( dev-db/sqlite:3 ) |
67 |
-" |
68 |
-DEPEND=" |
69 |
- ${RDEPEND} |
70 |
- >=sys-devel/libtool-2.4.2 |
71 |
- doc? ( app-doc/doxygen ) |
72 |
-" |
73 |
- |
74 |
-DOCS=(CHANGES NOTICE README) |
75 |
- |
76 |
-PATCHES=( |
77 |
- "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775 |
78 |
-) |
79 |
- |
80 |
-src_prepare() { |
81 |
- default |
82 |
- |
83 |
- # Fix usage of libmysqlclient (bug #620230) |
84 |
- grep -lrF "libmysqlclient_r" "${S}" \ |
85 |
- | xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \ |
86 |
- || die |
87 |
- |
88 |
- mv configure.{in,ac} || die |
89 |
- eautoreconf |
90 |
- elibtoolize |
91 |
-} |
92 |
- |
93 |
-src_configure() { |
94 |
- local myconf=( |
95 |
- --datadir="${EPREFIX}"/usr/share/apr-util-1 |
96 |
- --with-apr="${SYSROOT}${EPREFIX}"/usr |
97 |
- --with-expat="${EPREFIX}"/usr |
98 |
- --without-sqlite2 |
99 |
- $(use_with gdbm) |
100 |
- $(use_with ldap) |
101 |
- $(use_with mysql) |
102 |
- $(use_with nss) |
103 |
- $(use_with odbc) |
104 |
- $(use_with openssl) |
105 |
- $(use_with postgres pgsql) |
106 |
- $(use_with sqlite sqlite3) |
107 |
- ) |
108 |
- |
109 |
- tc-is-static-only && myconf+=( --disable-util-dso ) |
110 |
- |
111 |
- if use berkdb; then |
112 |
- local db_version |
113 |
- db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version" |
114 |
- db_version="$(db_ver_to_slot "${db_version}")" |
115 |
- db_version="${db_version/\./}" |
116 |
- myconf+=( |
117 |
- --with-dbm=db${db_version} |
118 |
- # We use $T for the libdir because otherwise it'd simply be the normal |
119 |
- # system libdir. That's pointless as the compiler will search it for |
120 |
- # us already. This makes cross-compiling and such easier. |
121 |
- --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}" |
122 |
- ) |
123 |
- else |
124 |
- myconf+=( --without-berkeley-db ) |
125 |
- fi |
126 |
- |
127 |
- if use nss || use openssl ; then |
128 |
- myconf+=( --with-crypto ) # 518708 |
129 |
- fi |
130 |
- |
131 |
- econf "${myconf[@]}" |
132 |
- # Use the current env build settings rather than whatever apr was built with. |
133 |
- sed -i -r \ |
134 |
- -e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \ |
135 |
- -e "/^CC=/s:=.*:=$(tc-getCC):" \ |
136 |
- -e '/^(C|CPP|CXX|LD)FLAGS=/d' \ |
137 |
- -e '/^LTFLAGS/s:--silent::' \ |
138 |
- build/rules.mk || die |
139 |
-} |
140 |
- |
141 |
-src_compile() { |
142 |
- emake |
143 |
- use doc && emake dox |
144 |
-} |
145 |
- |
146 |
-src_install() { |
147 |
- default |
148 |
- |
149 |
- find "${ED}" -name "*.la" -delete || die |
150 |
- if [[ -d "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then |
151 |
- find "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die |
152 |
- fi |
153 |
- if ! use static-libs ; then |
154 |
- find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die |
155 |
- fi |
156 |
- |
157 |
- if use doc ; then |
158 |
- docinto html |
159 |
- dodoc -r docs/dox/html/* |
160 |
- fi |
161 |
- |
162 |
- # This file is only used on AIX systems, which Gentoo is not, |
163 |
- # and causes collisions between the SLOTs, so remove it. |
164 |
- rm "${ED%/}/usr/$(get_libdir)/aprutil.exp" || die |
165 |
-} |