From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AB654138335 for ; Thu, 13 Sep 2018 13:47:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 240E5E0BFA; Thu, 13 Sep 2018 13:47:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E110DE0BDF for ; Thu, 13 Sep 2018 13:47:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99070335CFE for ; Thu, 13 Sep 2018 13:47:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F34133D7 for ; Thu, 13 Sep 2018 13:47:52 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1536846459.148fe8717308fd95da67a6442742b71cbab25c8b.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/apr-util/apr-util-1.6.1-r2.ebuild X-VCS-Directories: dev-libs/apr-util/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 148fe8717308fd95da67a6442742b71cbab25c8b X-VCS-Branch: master Date: Thu, 13 Sep 2018 13:47:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 169e0e9b-a7ae-4d5e-98a2-c785948aadad X-Archives-Hash: bfcdfcce7ff07e9b882e05b6891a26aa commit: 148fe8717308fd95da67a6442742b71cbab25c8b Author: Lars Wendler gentoo org> AuthorDate: Thu Sep 13 13:43:55 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Sep 13 13:47:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=148fe871 dev-libs/apr-util: Revbumps to replace virtual/mysql with dev-db/{mariadb,mysql}-connector-c Closes: https://bugs.gentoo.org/665874 Package-Manager: Portage-2.3.49, Repoman-2.3.10 dev-libs/apr-util/apr-util-1.6.1-r2.ebuild | 138 +++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/dev-libs/apr-util/apr-util-1.6.1-r2.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r2.ebuild new file mode 100644 index 00000000000..251a895865a --- /dev/null +++ b/dev-libs/apr-util/apr-util-1.6.1-r2.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Usually apr-util has the same PV as apr, but in case of security fixes, this may change. +# APR_PV="${PV}" +APR_PV="1.6.2" + +inherit autotools db-use libtool multilib toolchain-funcs + +DESCRIPTION="Apache Portable Runtime Utility Library" +HOMEPAGE="https://apr.apache.org/" +SRC_URI="mirror://apache/apr/${P}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="1" +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" +IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs" +#RESTRICT="test" + +RDEPEND=" + dev-libs/expat + >=dev-libs/apr-${APR_PV}:1= + berkdb? ( >=sys-libs/db-4:= ) + gdbm? ( sys-libs/gdbm:= ) + ldap? ( =net-nds/openldap-2* ) + mysql? ( || ( + dev-db/mariadb-connector-c + dev-db/mysql-connector-c + ) ) + nss? ( dev-libs/nss ) + odbc? ( dev-db/unixODBC ) + openssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) + postgres? ( dev-db/postgresql:= ) + sqlite? ( dev-db/sqlite:3 ) +" +DEPEND=" + ${RDEPEND} + >=sys-devel/libtool-2.4.2 + doc? ( app-doc/doxygen ) +" + +DOCS=(CHANGES NOTICE README) + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775 +) + +src_prepare() { + default + + # Fix usage of libmysqlclient (bug #620230) + grep -lrF "libmysqlclient_r" "${S}" \ + | xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \ + || die + + mv configure.{in,ac} || die + eautoreconf + elibtoolize +} + +src_configure() { + local myconf=( + --datadir="${EPREFIX}"/usr/share/apr-util-1 + --with-apr="${SYSROOT}${EPREFIX}"/usr + --with-expat="${EPREFIX}"/usr + --without-sqlite2 + $(use_with gdbm) + $(use_with ldap) + $(use_with mysql) + $(use_with nss) + $(use_with odbc) + $(use_with openssl) + $(use_with postgres pgsql) + $(use_with sqlite sqlite3) + ) + + tc-is-static-only && myconf+=( --disable-util-dso ) + + if use berkdb; then + local db_version + db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version" + db_version="$(db_ver_to_slot "${db_version}")" + db_version="${db_version/\./}" + myconf+=( + --with-dbm=db${db_version} + # We use $T for the libdir because otherwise it'd simply be the normal + # system libdir. That's pointless as the compiler will search it for + # us already. This makes cross-compiling and such easier. + --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}" + ) + else + myconf+=( --without-berkeley-db ) + fi + + if use nss || use openssl ; then + myconf+=( --with-crypto ) # 518708 + fi + + econf "${myconf[@]}" + # Use the current env build settings rather than whatever apr was built with. + sed -i -r \ + -e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \ + -e "/^CC=/s:=.*:=$(tc-getCC):" \ + -e '/^(C|CPP|CXX|LD)FLAGS=/d' \ + -e '/^LTFLAGS/s:--silent::' \ + build/rules.mk || die +} + +src_compile() { + emake + use doc && emake dox +} + +src_install() { + default + + find "${ED}" -name "*.la" -delete || die + if [[ -d "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then + find "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die + fi + if ! use static-libs ; then + find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die + fi + + if use doc ; then + docinto html + dodoc -r docs/dox/html/* + fi + + # This file is only used on AIX systems, which Gentoo is not, + # and causes collisions between the SLOTs, so remove it. + rm "${ED%/}/usr/$(get_libdir)/aprutil.exp" || die +}