| 1 |
grknight 15/06/26 17:33:50 |
| 2 |
|
| 3 |
Modified: cyrus-imapd-2.4.17-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Non-maintainer commit: Fix mysql_config references for build failures wrt bug 525102 |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D1F781EFF9F4A3B6) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: cyrus-imapd-2.4.17-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- cyrus-imapd-2.4.17-r1.ebuild 28 Dec 2014 16:31:47 -0000 1.4 |
| 23 |
+++ cyrus-imapd-2.4.17-r1.ebuild 26 Jun 2015 17:33:50 -0000 1.5 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2014 Gentoo Foundation |
| 26 |
+# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI=4 |
| 32 |
|
| 33 |
@@ -17,12 +17,13 @@ |
| 34 |
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 35 |
IUSE="afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd" |
| 36 |
|
| 37 |
+# virtual/mysql-5.5 added for the --variable= option below |
| 38 |
RDEPEND="sys-libs/zlib |
| 39 |
>=dev-libs/cyrus-sasl-2.1.13 |
| 40 |
afs? ( net-fs/openafs ) |
| 41 |
berkdb? ( >=sys-libs/db-3.2 ) |
| 42 |
kerberos? ( virtual/krb5 ) |
| 43 |
- mysql? ( virtual/mysql ) |
| 44 |
+ mysql? ( >=virtual/mysql-5.5 ) |
| 45 |
nntp? ( !net-nntp/leafnode ) |
| 46 |
pam? ( |
| 47 |
virtual/pam |
| 48 |
@@ -98,9 +99,8 @@ |
| 49 |
src_configure() { |
| 50 |
local myconf |
| 51 |
if use mysql ; then |
| 52 |
- myconf=$(mysql_config --include) |
| 53 |
- myconf="--with-mysql-incdir=${myconf#-I}" |
| 54 |
- myconf+=" --with-mysql-libdir=/usr/$(get_libdir)/mysql" |
| 55 |
+ myconf="--with-mysql-incdir=$(mysql_config --variable=pkgincludedir)" |
| 56 |
+ myconf+=" --with-mysql-libdir=$(mysql_config --variable=pkglibdir)" |
| 57 |
fi |
| 58 |
if use afs ; then |
| 59 |
myconf+=" --with-afs-libdir=/usr/$(get_libdir)" |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.216 net-mail/cyrus-imapd/ChangeLog |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?rev=1.216&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?rev=1.216&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?r1=1.215&r2=1.216 |
| 68 |
|
| 69 |
Index: ChangeLog |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v |
| 72 |
retrieving revision 1.215 |
| 73 |
retrieving revision 1.216 |
| 74 |
diff -u -r1.215 -r1.216 |
| 75 |
--- ChangeLog 28 Dec 2014 16:31:47 -0000 1.215 |
| 76 |
+++ ChangeLog 26 Jun 2015 17:33:50 -0000 1.216 |
| 77 |
@@ -1,6 +1,10 @@ |
| 78 |
# ChangeLog for net-mail/cyrus-imapd |
| 79 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.215 2014/12/28 16:31:47 titanofold Exp $ |
| 81 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 82 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.216 2015/06/26 17:33:50 grknight Exp $ |
| 83 |
+ |
| 84 |
+ 26 Jun 2015; Brian Evans <grknight@g.o> cyrus-imapd-2.4.17-r1.ebuild: |
| 85 |
+ Non-maintainer commit: Fix mysql_config references for build failures wrt bug |
| 86 |
+ 525102 |
| 87 |
|
| 88 |
28 Dec 2014; Aaron W. Swenson <titanofold@g.o> |
| 89 |
cyrus-imapd-2.4.16.ebuild, cyrus-imapd-2.4.17.ebuild, |
Archives