1 |
commit: e595c0af13030970058ded742756fca058baefbe |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 23 08:54:07 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 23 08:54:58 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e595c0af |
7 |
|
8 |
dev-libs/apr-util: Bump to version 1.6.1 |
9 |
|
10 |
Package-Manager: Portage-2.3.12, Repoman-2.3.3 |
11 |
|
12 |
dev-libs/apr-util/Manifest | 1 + |
13 |
dev-libs/apr-util/apr-util-1.6.1.ebuild | 135 ++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 136 insertions(+) |
15 |
|
16 |
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest |
17 |
index e9d90f82b1f..f91748731a6 100644 |
18 |
--- a/dev-libs/apr-util/Manifest |
19 |
+++ b/dev-libs/apr-util/Manifest |
20 |
@@ -1,2 +1,3 @@ |
21 |
DIST apr-util-1.5.4.tar.bz2 694427 SHA256 a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e SHA512 ca877d8e444218c4ba0f28063ee075ddcd6c0a487b692dc80ef442fe775ec4eeb337c6957853772e8082e27edcb450d7e909c2c6c3ab4a95bbf0a5ee5ea4a2d1 WHIRLPOOL bc4ce82785513f4bf2207bb26758abc79e6bfef62a57d3e2ead570abc618b321c302390b9dcd8eab1ec44a9e5d398c2cc4d35af2549636e20d7c20678725ac2e |
22 |
DIST apr-util-1.6.0.tar.bz2 428750 SHA256 8474c93fa74b56ac6ca87449abe3e155723d5f534727f3f33283f6631a48ca4c SHA512 dc88c13ef6116ed1c67584436cb8ca94ef77d358cb60c7cafab953d36d00564776414faed43397755e79bcf1b14dfca81cad2e280a2dd4c31f6e4559583effd0 WHIRLPOOL a41e90c781d6fd0792ba4d4941744d61bee2289b72529ccca92fbcb671234e80d7faee7e6fa8cf86e6f2d822e6429cff17721a96fdb6527f0802cbd6ed4c1284 |
23 |
+DIST apr-util-1.6.1.tar.bz2 428595 SHA256 d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d WHIRLPOOL 66ec9e7f5c596c0eba93329d61b565013bd16388e958bf50f947d977e11ef0a562cf72aa6cce3f24d0748f0f296a011ecbf2a61b6ee5333e0baf3e91ea429fa7 |
24 |
|
25 |
diff --git a/dev-libs/apr-util/apr-util-1.6.1.ebuild b/dev-libs/apr-util/apr-util-1.6.1.ebuild |
26 |
new file mode 100644 |
27 |
index 00000000000..ec528c173dd |
28 |
--- /dev/null |
29 |
+++ b/dev-libs/apr-util/apr-util-1.6.1.ebuild |
30 |
@@ -0,0 +1,135 @@ |
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 |
+} |