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 708FA139694 for ; Wed, 31 May 2017 12:56:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EB0DE0EBA; Wed, 31 May 2017 12:56:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 57691E0EBA for ; Wed, 31 May 2017 12:56:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 62499341729 for ; Wed, 31 May 2017 12:56:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2837D745E for ; Wed, 31 May 2017 12:56:41 +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: <1496235397.22262ade2b169f4786c12125b2d0d9705f99c5a6.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.5.4-r2.ebuild dev-libs/apr-util/apr-util-1.5.4-r3.ebuild X-VCS-Directories: dev-libs/apr-util/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 22262ade2b169f4786c12125b2d0d9705f99c5a6 X-VCS-Branch: master Date: Wed, 31 May 2017 12:56:41 +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: e84fda78-4c0a-40e3-82de-11cf82093208 X-Archives-Hash: 50a8c2c6c35ce02f33fc52481721be88 commit: 22262ade2b169f4786c12125b2d0d9705f99c5a6 Author: Lars Wendler gentoo org> AuthorDate: Wed May 31 12:54:43 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed May 31 12:56:37 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22262ade dev-libs/apr-util: Reintroduced mysql support (bug #620230). Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../{apr-util-1.5.4-r2.ebuild => apr-util-1.5.4-r3.ebuild} | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dev-libs/apr-util/apr-util-1.5.4-r2.ebuild b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild similarity index 91% rename from dev-libs/apr-util/apr-util-1.5.4-r2.ebuild rename to dev-libs/apr-util/apr-util-1.5.4-r3.ebuild index 3bb7a167d63..db5d7e6c1f0 100644 --- a/dev-libs/apr-util/apr-util-1.5.4-r2.ebuild +++ b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild @@ -16,7 +16,7 @@ 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 ~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" -IUSE="berkdb doc freetds gdbm ldap libressl nss odbc openssl postgres sqlite static-libs" +IUSE="berkdb doc freetds gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs" #RESTRICT="test" RDEPEND=" @@ -26,6 +26,7 @@ RDEPEND=" freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) + mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( @@ -49,6 +50,12 @@ PATCHES=( 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 @@ -83,11 +90,11 @@ src_configure() { --datadir="${EPREFIX}"/usr/share/apr-util-1 --with-apr="${SYSROOT}${EPREFIX}"/usr --with-expat="${EPREFIX}"/usr - --without-mysql --without-sqlite2 $(use_with freetds) $(use_with gdbm) $(use_with ldap) + $(use_with mysql) $(use_with nss) $(use_with odbc) $(use_with openssl)