Non-maintainer commit: Fix mysql_config references for build failures wrt bug 525102

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

3 files changed, 30 insertions, 14 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index fd4db9540bc5..74436c8734c5 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -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 <grknight@gentoo.org> 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 <titanofold@gentoo.org>
   cyrus-imapd-2.4.16.ebuild, cyrus-imapd-2.4.17.ebuild,
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 4b5c1e9b2b95..87484e8b00d1 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -10,14 +10,26 @@ AUX imapd.conf 1587 SHA256 69eacd9fffad55f20990fcf3b117fe4e2ac55233515ed70698c65
 DIST cyrus-imapd-2.4.16.tar.gz 2484201 SHA256 beac9d6059680bbf65948db60a30c6e8f59786df4a7821c70dc27b2a225f32c4 SHA512 31931e94ebe869516f10886cee5ab152fb6d6376bf009250718077732c6172a6430f3502370e15e94f6165500e5b4108623bceea7c0dcfb3eb746e9ff0fcffab WHIRLPOOL 1e9916d03448e7f036aa6320af69a7ae57ae37205f98d4cfee8c335d9dcdc1c09ba243f4506036da4ca17f859f5c7eef0cb56443dfe51ad3075f0e4d62874fcb
 DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583 SHA512 86ffe1664ca3c3df164ed8fca21cc08ddae12380e1485deccec7da4ec263d8b953a806e05f0b10f6fb7717a0d40fc05669792b77cc66d7c5067061c8506e59ee WHIRLPOOL 22566578217a5901793b886ff020aa1deecbb81bf85f54a524b58de129029e51b0aa358db902a2139584d05f668404cb98ca2ff3fa33803ce986e07b95c69c45
 EBUILD cyrus-imapd-2.4.16.ebuild 4924 SHA256 c402a10f9c32b1ec54a5a5c2a432b6973aed5185e94569ecfb716afbd69b6c78 SHA512 50c88579d3be4ac393c84b777e57f9d2fc557a4ba11db3a5fccbd5b6af0cf5318ff7e70fbb1645f23d90f8f2cd67e49c5a2eb92576412d07d9e9f5ad0a888ba0 WHIRLPOOL ceba5e9a91cb1fce9d700c02014a58783511d36dd674fdd2ce8861e35fca8fe278e062e4bf37cb604f96d745a4da27ea0035fe372720a8204d8484f4499a7a39
-EBUILD cyrus-imapd-2.4.17-r1.ebuild 5471 SHA256 c544eca01e13e8cf6ac0169c8491d52524eeaab929e1d10619d340b180ff2ed0 SHA512 5925b7958104ef0cc51eb268897cace746d12bfd11fd780509209a894bf756ae8e81cd9408069d2158a6c03a48212e4610abfd89ff65b835d74b5af9e93c9941 WHIRLPOOL 82b2b3df08c405b0e7f40c2ae8de21e32103b37e026cd9ad6af23faf2b223ed76e045f55b259f4a8f7a2228cc5f191331d96ab8842c9b0cc0858cc60526d9595
+EBUILD cyrus-imapd-2.4.17-r1.ebuild 5539 SHA256 1f365c08b65cb55be17827a21ddd142905200558650834935661aa69a0989fe9 SHA512 0180b4aa07b73f819751ad5fca091baef2a46d9e64b11b68ff06a22f3556ad5fbe6416869eb4f006ad3dd3136ec57aacd68cb70a4df33cfadbdb1adbd133105c WHIRLPOOL 4e30cd8ed811294c22fe38b7436a150e315a5bebe28ec0d60bd5af0dbc6d235584659cb6c3323a46b30f81c831d544c03d0ec112e653561abf8cf985b6f9548b
 EBUILD cyrus-imapd-2.4.17.ebuild 5273 SHA256 92c2cec62763463645f3cc964a929db0f0d495ee8fff296df212f0fb6d989101 SHA512 3b5eb4b5bcc64f923e68e26eba4957cbdf97b7cb4e2c74580db8514fa9bfce2fd88828b6a36cb85594891ebae170bc3433f6b94e8501df20caff56c75ee39447 WHIRLPOOL 130ce08eff26e045b4eb26e524e67a669ffcf61f20a98a4734e55aaa83fcdf7388269219931dd758a9574aaebf8bc8b5192283134ec2a1c3c3fad56932bb0df0
-MISC ChangeLog 38425 SHA256 89a85039648b9b8f0895975a979e07628e54a406068169fd25073f8c24f80c99 SHA512 4ec75ff313c921285bbdcffa0e9ae9d4286b44141213a1f33b75a7ba208abb0851721934f8a8c4e01deba151abc6a7b0906a104590d03f95cb3fe97644613f9d WHIRLPOOL 556910c51648b220cb96099a5e85142e5bf871b99604693d95d63da5e3c1451a2ad861c058bc5b61efb8bd1eee8b388a3cdf89517320bc87eb1fcfef048f597a
+MISC ChangeLog 38592 SHA256 00882e095e2351533072e9243980df79283836cbed03c938af7b5d751b406667 SHA512 2f083ab9fa6aa495979f28b4e67d7987ab4ceab21ab1cec8f6b2b9bae97dc263b7ccff4d9ab95d3df034b3b5d559ec5a3a04f36d51b663edcb5edfe07a1a38e0 WHIRLPOOL 8a8030d4cd17dbb0b2d0bd915c8a975b8829ffb236b4d244d274cf685e4c33542d7ad1d035a3ee6a4f3c9c2fe907eb88d74135f03e4848d940d92025b7d6e594
 MISC metadata.xml 313 SHA256 4fc55c30d8af0d3b7555b4c0d5fa85ccc60232dc786d56a25c5482079a367ecd SHA512 cea96d1ce7e691487f4818d3bccd9fd7eb4794766be6b1a50d261cd78c49c8cca1a48f06f0efd0113bbe999da5341a5b42ba39083a36af6a278fc55e1b01a547 WHIRLPOOL 00267ff3d40dcbba12a8a07b3e34873b586280024a803cd151a6e9391214600320ea133a91e15f2cfdc8779914b5f6a6ff08712f83275183f94acb91fc772c59
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iF4EAREIAAYFAlSgMHUACgkQVxOqA9G7/aAaiQD/ZaVbGRyn7HVUpyccIpxoRVlX
-CAnXSwfzz8LiI8geoNMA/AtJ/7BnOG23Bm2o9u+bf8ZyRxPMVhPT4EK8YCPTQFHi
-=hQYA
+iQJ8BAEBCABmBQJVjY2JXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2h60QALZ/Ma1VTmmsLefeCL9RJ4Ia
+Y348EGqQuUj1afWDABfJGbwe3TtQuLhjfQJdbHSSRh8gfsAewE0h0B4nrHTkJzA4
+M8xd08C+3FZj19a/hImriEiDb+twN8BMcPD4ao2hv8tltNBEoTQGPn/Mn7c3RiCm
+Qj/Eb/mw2KQV+Szlti5+E2o7/5TO4cJDub2+H6r1bO8BydPRVmTQQND4ci9BKnUK
+R+vCrPqywU7Jg7pE+LDyqRqs96vm3vc4jNywLi1QQo5ioixkZJCw9pxFINtHpPtJ
+fqwnf12/FpjPgWExrJNRF3xNWu4iD551dlDA4nCXflFInubd82zRaPGH9QUP99IO
+duLM6R79OPnA0Si3hYUA2bx1wWDCb0mEnUqs87bDlhJu7JS6cqMysXAnOLPItMSC
+49We1C1+56wUI0Fq+v6bwRuptOK5QENK+i3SCYwy+2oaX6kT8Tib7C/S/E1o1JvE
+jNdLdkGBw1Lq7pIFWDwZvGQPCU9Zkb/ll39KQGpQAbBWCg5xmHSTfsJKEz2Ap6f7
+/yP0IQ0bdo7pH7THd5bUee0IaMSqzHzOmgQHCoHnoK7ZKjfqsmEM7XoQ2dBQFih9
+0dpZozRCJUngx6kDezlxYuJq2rjkkJXFDLwwNK0VMoX9rzMOiLwJJ4Kh+2rXwJfM
+cyPWBRvqaWR2kA1IK8yd
+=Srhq
 -----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
index cab58c7999d2..0b466c03b084 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
@@ -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 @@ SLOT="0"
 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_prepare() {
 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)"