commit: ce73e9fc91ec8bdf6e238987ee4f765f64bcd73d Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Wed Jun 6 21:16:26 2018 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Fri Jun 8 05:11:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce73e9fc
net-mail/vpopmail: fix linking Bug: https://bugs.gentoo.org/526590 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> Package-Manager: Portage-2.3.33, Repoman-2.3.9 net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild | 15 +++++++------- ...-5.4.33-r1.ebuild => vpopmail-5.4.33-r2.ebuild} | 23 ++++++++++++---------- net-mail/vpopmail/vpopmail-5.4.33.ebuild | 15 +++++++------- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild index ecc09b21af2..a41fd4be75c 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -82,14 +82,15 @@ src_configure() { local authopts if use mysql; then - mysqlinc=$(mysql_config --include) - authopts="--enable-incdir=${mysqlinc#-I}" + incdir=$(mysql_config --variable=pkgincludedir) + libdir=$(mysql_config --variable=pkglibdir) authopts+=" --enable-auth-module=mysql" - authopts+=" --enable-libdir=/usr/$(get_libdir)/mysql" - authopts+=" --enable-sql-logging" + authopts+=" --enable-incdir=${incdir}" + authopts+=" --enable-libdir=${libdir}" + authopts+=" --enable-sql-logging" authopts+=" --enable-valias" - authopts+=" --disable-mysql-replication" - authopts+=" --enable-mysql-limits" + authopts+=" --disable-mysql-replication" + authopts+=" --enable-mysql-limits" elif use postgres; then pglibdir=$(pg_config --libdir) authopts+=" --enable-auth-module=pgsql" diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild similarity index 92% copy from net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild copy to net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild index ecc09b21af2..498c53bc733 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -17,7 +17,7 @@ REQUIRED_USE="mysql? ( !postgres )" DEPEND="virtual/qmail maildrop? ( mail-filter/maildrop ) - mysql? ( virtual/mysql ) + mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c[mysqlcompat] ) ) postgres? ( dev-db/postgresql[server] ) spamassassin? ( mail-filter/spamassassin )" RDEPEND="${DEPEND}" @@ -82,18 +82,21 @@ src_configure() { local authopts if use mysql; then - mysqlinc=$(mysql_config --include) - authopts="--enable-incdir=${mysqlinc#-I}" + incdir=$(mysql_config --variable=pkgincludedir) + libdir=$(mysql_config --variable=pkglibdir) authopts+=" --enable-auth-module=mysql" - authopts+=" --enable-libdir=/usr/$(get_libdir)/mysql" - authopts+=" --enable-sql-logging" + authopts+=" --enable-incdir=${incdir}" + authopts+=" --enable-libdir=${libdir}" + authopts+=" --enable-sql-logging" authopts+=" --enable-valias" - authopts+=" --disable-mysql-replication" - authopts+=" --enable-mysql-limits" + authopts+=" --disable-mysql-replication" + authopts+=" --enable-mysql-limits" elif use postgres; then - pglibdir=$(pg_config --libdir) + libdir=$(pg_config --libdir) + incdir=$(pg_config --pkgincludedir) authopts+=" --enable-auth-module=pgsql" - authopts+=" --enable-libdir=${pglibdir}" + authopts+=" --enable-incdir=${incdir}" + authopts+=" --enable-libdir=${libdir}" authopts+=" --enable-sql-logging" authopts+=" --enable-valias" else diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild index 0084ce003a7..e98c76b20ef 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -76,14 +76,15 @@ src_configure() { local authopts if use mysql; then - authopts="$(mysql_config --include)" - authopts="--enable-incdir=${authopts#-I}" + incdir=$(mysql_config --variable=pkgincludedir) + libdir=$(mysql_config --variable=pkglibdir) authopts+=" --enable-auth-module=mysql" - authopts+=" --enable-libdir=/usr/$(get_libdir)/mysql" - authopts+=" --enable-sql-logging" + authopts+=" --enable-incdir=${incdir}" + authopts+=" --enable-libdir=${libdir}" + authopts+=" --enable-sql-logging" authopts+=" --enable-valias" - authopts+=" --disable-mysql-replication" - authopts+=" --enable-mysql-limits" + authopts+=" --disable-mysql-replication" + authopts+=" --enable-mysql-limits" else authopts="--enable-auth-module=cdb" fi
