Fix/improve locating MySQL and PostgreSQL libraries, patch by Alexander Tsoy in bug #477792

Package-Manager: portage-2.2.01.22124-prefix/cvs/Darwin i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 23 insertions, 17 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 0464658c31c8..b3b1b9b46d52 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.247 2013/07/23 17:16:27 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.248 2013/07/23 17:32:39 grobian Exp $
+
+  23 Jul 2013; Fabian Groffen <grobian@gentoo.org> exim-4.80.1-r1.ebuild,
+  exim-4.80.1.ebuild:
+  Fix/improve locating MySQL and PostgreSQL libraries, patch by Alexander Tsoy
+  in bug #477792
 
   23 Jul 2013; Fabian Groffen <grobian@gentoo.org> files/exim.logrotate:
   Remove now useless sharedscripts from logrotate, thanks Alexander Tsoy
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 097ee6b4160c..8cade4679d02 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -19,14 +19,15 @@ DIST exim-4.80.1.tar.bz2 1650082 SHA256 9565b10f06be224fd03adafae2e07e6fdbb479f8
 DIST exim-html-4.80.1.tar.bz2 404894 SHA256 206ef4acc2641f10f3f23f8ee97cd1f7125486938ea1fc231ac2a1d5d6c9be09 SHA512 c3f7eef6c7d1981185c5d7bae6a1bf4645468d105e85990accf56f66daf809ad8fb0f3e50925339a72c510e2cc0eced864bc06d526e5b735744f4478dd32d373 WHIRLPOOL 7d67d196e0613fba36d7e1e1370b0b1a6f60739befaa7d2f9661bcef9f57df9586aa63a99faa6a5d25619c2cd7186d2bdf27059f1d229be5d8199d6ec3f6b49c
 DIST exim_469_dsn_1_3.patch 40222 SHA256 605c520ea79507fd387772796c62303c5a49d1dc47b744b4267301096eedd49a SHA512 99cfb5c0c28849452b2b7a6f2b47abf78a77f970465ab5a3a5d68089dd5964610d8c64d1a380051da06f8e85ee7a073ee651b53dbac7451d9be55c78093178e5 WHIRLPOOL 7789e301a9aebe81fc0f3c68875f91e61413b5e8ca41b32562aff6146e1353b5a2a9a158455a18b16cf82a4fdcbb1a8a66fb85842387bc0afbd270ee91e27692
 DIST system_filter.exim.gz 3075 SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3 WHIRLPOOL ce68d9c18b24eca3ef97ea810964cc1ada5f85b795a7c432ad39b5788188a16419101c92fb52b418738d760e1d658f7a41485e5561079a667d84d276c71be5a4
-EBUILD exim-4.80.1-r1.ebuild 11829 SHA256 b4b9e349aef13f0684a774691536f7ff71a9075c8dbfb7fb3f7f8ab251fa8883 SHA512 9f4f90af44a6a4369996c4562ad964a5a6501df83b3904ef204225ed992775a01705876cb65c8c362ec556243c700921ab844ac3ea9adb8349efc1c2d831488f WHIRLPOOL be0fd4770fe490323c9affded6f7e8b840d5c302005eb1492ec28732d36f3a9f03935ea9bad9f04f317a09a1a28b17b7115eeef28211fe42364ecf327965f566
-EBUILD exim-4.80.1.ebuild 11527 SHA256 d9abb6d919c25dcde132f31c5b58199f23dcdcace11eb2a2bbd2d83b40790974 SHA512 b55a4a3a7aa81a492881ea402a0455cd03fa4db6ff19cdf5b7f386440704ced53d45ce119572557c5bcef8df76e75541d383be3623298cf2af420788ba1e450b WHIRLPOOL 7425c30f5a2ccc931c3abc23240f0efa0d5fe9c24a55b9bab24006a1572adcdb7e893acfe3abbed6dffdb9b53d0dda16fb50a61f7446ffa15a431b75c188782e
-MISC ChangeLog 48385 SHA256 d92cc9b2995eb9b6871f5bbc0818a2e461caa0e1a8217eb17a22a64434241c7a SHA512 c81fd51cb9559b379526e0cac97100e22f551f9252b4fa2ca1e948334926ce923aa1bb052ef4e9f683d13a356b42a8d2a02634974c0149c66a4bab3e8135d3af WHIRLPOOL 023415d1d510ea9e8740f30e49827b1b65586bbdc0e799883e4c45bdb379a5280ce6119085b7263519dfb46babea4d6c606206e8c3c5c6207bd73eac3499aa83
+EBUILD exim-4.80.1-r1.ebuild 11855 SHA256 5587525e9af752c8450832c423ce86da588326e3689261ee65b394c54d8dafee SHA512 92df71bb6508977dd88e82c1d86a76c1f42b6d97f71aa2516a942d8e7449c2765131efea8e60c5d5132e93a80bab7270dd57c243f368178a7bf7226f87ee0073 WHIRLPOOL 2de3e7b5420d541bbcbda74d5d0f629284b092719464450fb65285a656b9c97c130de570445afed88a7975510d7e1b6bcdba8335b56e50b839010b1591bd576c
+EBUILD exim-4.80.1.ebuild 11553 SHA256 dcfde2297dc2b7f82ebd915dd86f07fbfc5f01265f4303bca141ab8c2730f4d5 SHA512 9fb22b860472b145fb7de0197dbda779ca4f071f0237abe02206b6b5d5fcdfad91dcf50714a8af5b734c18600092d16b49ab60f102472bc8e09d542b7fe3d6cc WHIRLPOOL 9caa98e32b1199c3aefb7a38f7e6b6acd4a71b09311ef51f271a4071adbf23be79a2198cf399224ec5380935814c147b0625d896f0c478d7093d760e42c8eb37
+MISC ChangeLog 48578 SHA256 b3a6d3b28115c03350e86726e052bf4cc7b35ee278affe29d371dbf6f8f9871b SHA512 0c37ca23315f27cce5825675536090467349074633aebbab0d8ad0c257b7fdda0b2155600f0b4e85aa8f9259af8626444a8b00c3a68357b43120bbaf4a02d833 WHIRLPOOL 940b9d1c6d9aa9f38251f434d0ea990e375d180c253a016b94d2735247f20e96659f8354e46f873220c90fc3034ae65389504eefc8ec82e37e685321b58ef39b
+MISC exim-4.80.1-r1.ebuild.orig 11829 SHA256 b4b9e349aef13f0684a774691536f7ff71a9075c8dbfb7fb3f7f8ab251fa8883 SHA512 9f4f90af44a6a4369996c4562ad964a5a6501df83b3904ef204225ed992775a01705876cb65c8c362ec556243c700921ab844ac3ea9adb8349efc1c2d831488f WHIRLPOOL be0fd4770fe490323c9affded6f7e8b840d5c302005eb1492ec28732d36f3a9f03935ea9bad9f04f317a09a1a28b17b7115eeef28211fe42364ecf327965f566
 MISC metadata.xml 1842 SHA256 1f8d0a0ac10f8ded348ca80419a3c6811ba7b6bf9d48a94a058e2b90414f5e59 SHA512 423fdf58ed326ae7590c8f74c1da1a3d46b1b81ba6ef301b636ce6217ba73e5d24b80ded88a6817e05df5c9ccdb8854483879e7d617d47c6e41ce83c218809b2 WHIRLPOOL d7f1e4bab5f5576a13c9bc99fac06aea7a844855996a5345b0dacba4b4a2a5307da958a1e0029fafc157ca85fe7f5260230dcbcd25c2c925674a0f022b4fca4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (Darwin)
 
-iEYEAREIAAYFAlHuumwACgkQX3X2B8XHTokMAACfRG3Y1XVyF0BmE5zSRg3Gf04T
-bWUAn3tUIbUGz56oPfndRiipua6Gm3H1
-=b2z1
+iEYEAREIAAYFAlHuvjgACgkQX3X2B8XHTolcbACeJV5a4ax6SKYKCZEWIErCIppx
+A8gAoI4DrdkpabmHHqjXYj53J5kukphB
+=1GcX
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/exim/exim-4.80.1-r1.ebuild b/mail-mta/exim/exim-4.80.1-r1.ebuild
index 10a6ee83ea08..40d60762f917 100644
--- a/mail-mta/exim/exim-4.80.1-r1.ebuild
+++ b/mail-mta/exim/exim-4.80.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.80.1-r1.ebuild,v 1.2 2013/07/23 09:17:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.80.1-r1.ebuild,v 1.3 2013/07/23 17:32:39 grobian Exp $
 
 EAPI="4"
 
@@ -229,14 +229,14 @@ src_configure() {
 
 	if use mysql; then
 		sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/mysql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lmysqlclient"
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE $(mysql_config --include)"
+		LOOKUP_LIBS="$LOOKUP_LIBS $(mysql_config --libs)"
 	fi
 
 	if use postgres; then
 		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/postgresql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I$(pg_config --includedir)"
+		LOOKUP_LIBS="$LOOKUP_LIBS -L$(pg_config --libdir) -lpq"
 	fi
 
 	if use sqlite; then
diff --git a/mail-mta/exim/exim-4.80.1.ebuild b/mail-mta/exim/exim-4.80.1.ebuild
index 1e261a4b07dc..96a2d7c3fd15 100644
--- a/mail-mta/exim/exim-4.80.1.ebuild
+++ b/mail-mta/exim/exim-4.80.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.80.1.ebuild,v 1.13 2013/03/23 18:00:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.80.1.ebuild,v 1.14 2013/07/23 17:32:39 grobian Exp $
 
 EAPI="3"
 
@@ -232,14 +232,14 @@ src_configure() {
 
 	if use mysql; then
 		sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/mysql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lmysqlclient"
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE $(mysql_config --include)"
+		LOOKUP_LIBS="$LOOKUP_LIBS $(mysql_config --libs)"
 	fi
 
 	if use postgres; then
 		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/postgresql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I$(pg_config --includedir)"
+		LOOKUP_LIBS="$LOOKUP_LIBS -L$(pg_config --libdir) -lpq"
 	fi
 
 	if use sqlite; then