grknight 15/06/26 17:33:50 Modified: cyrus-imapd-2.4.17-r1.ebuild ChangeLog Log: Non-maintainer commit: Fix mysql_config references for build failures wrt bug 525102 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D1F781EFF9F4A3B6)
Revision Changes Path 1.5 net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild?r1=1.4&r2=1.5 Index: cyrus-imapd-2.4.17-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cyrus-imapd-2.4.17-r1.ebuild 28 Dec 2014 16:31:47 -0000 1.4 +++ cyrus-imapd-2.4.17-r1.ebuild 26 Jun 2015 17:33:50 -0000 1.5 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild,v 1.4 2014/12/28 16:31:47 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild,v 1.5 2015/06/26 17:33:50 grknight Exp $ EAPI=4 @@ -17,12 +17,13 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd" +# virtual/mysql-5.5 added for the --variable= option below RDEPEND="sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) - mysql? ( virtual/mysql ) + mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam @@ -98,9 +99,8 @@ src_configure() { local myconf if use mysql ; then - myconf=$(mysql_config --include) - myconf="--with-mysql-incdir=${myconf#-I}" - myconf+=" --with-mysql-libdir=/usr/$(get_libdir)/mysql" + myconf="--with-mysql-incdir=$(mysql_config --variable=pkgincludedir)" + myconf+=" --with-mysql-libdir=$(mysql_config --variable=pkglibdir)" fi if use afs ; then myconf+=" --with-afs-libdir=/usr/$(get_libdir)" 1.216 net-mail/cyrus-imapd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?rev=1.216&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?rev=1.216&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?r1=1.215&r2=1.216 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- ChangeLog 28 Dec 2014 16:31:47 -0000 1.215 +++ ChangeLog 26 Jun 2015 17:33:50 -0000 1.216 @@ -1,6 +1,10 @@ # ChangeLog for net-mail/cyrus-imapd -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.215 2014/12/28 16:31:47 titanofold Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.216 2015/06/26 17:33:50 grknight Exp $ + + 26 Jun 2015; Brian Evans <[email protected]> cyrus-imapd-2.4.17-r1.ebuild: + Non-maintainer commit: Fix mysql_config references for build failures wrt bug + 525102 28 Dec 2014; Aaron W. Swenson <[email protected]> cyrus-imapd-2.4.16.ebuild, cyrus-imapd-2.4.17.ebuild,
