Moking pkg-config calls to src_compile() to avoid problems in binary packages.

Package-Manager: portage-2.0.52-r1

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 442b4a5382a6ed639b5d90b03274ff773e1c850e..4dd4ef37a5a1cfb62b60a9b7d5bf5e693ec8f5d1 100644 (file)
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.59 2005/09/05 18:29:19 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.60 2005/09/10 15:44:21 leonardop Exp $
+
+  10 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
+  evolution-data-server-1.4.0.ebuild:
+  Move pkg-config calls to src_compile() to avoid problems in binary
+  packages.
 
 *evolution-data-server-1.4.0 (05 Sep 2005)
 

diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 18eef77d83d75a41380a9c28eb8183499da406f7..ba0e42b291fede7533e0cf791e35cd560390d1b6 100644 (file)
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,5 +1,5 @@
-MD5 4857063db04a140f2372136657f76ad4 ChangeLog 8471
-MD5 03cf32e01f3e28123720cc5d582168cf evolution-data-server-1.4.0.ebuild 3517
+MD5 2e9211dbaffd190c9a2a45ad5e9388c0 ChangeLog 8646
+MD5 c958e8f11e169273587f1c902b347dd2 evolution-data-server-1.4.0.ebuild 3517
 MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
 MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.4.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.4.0.ebuild
index 71764cfbec828d3a5d39b735b491c713f424db4f..4e2cba6ed4a94839e732b3b50830bf6e8e884645 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.4.0.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.4.0.ebuild,v 1.1 2005/09/05 18:29:19 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.4.0.ebuild,v 1.2 2005/09/10 15:44:21 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -55,6 +55,35 @@ pkg_setup() {
 
        use ldap && G2CONF="${G2CONF} $(use_with static static-ldap)"
 
+       if use krb4 && ! built_with_use virtual/krb5 krb4; then
+               ewarn
+               ewarn "In order to add kerberos 4 support, you have to emerge"
+               ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
+               ewarn
+               ewarn "Skipping for now."
+               ewarn
+               G2CONF="${G2CONF} --without-krb4"
+       else
+               G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
+       fi
+}
+
+src_unpack() {
+       unpack "${A}"
+       cd "${S}"
+
+       epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
+       # upstream gcc4 fix
+       epatch ${FILESDIR}/${PN}-1.2.3-gcc4.patch
+
+       # Resolve symbols at execution time for setgid binaries
+       epatch ${FILESDIR}/${PN}-no_lazy_bindings.patch
+
+       export WANT_AUTOMAKE=1.7
+       automake || die "automake failed"
+}
+
+src_compile() {
        # Use NSS/NSPR only if 'ssl' is enabled. They can be used from
        # mozilla/firefox if the relevant USE flags are enabled. 'firefox' take
        # precedence over 'mozilla'.
@@ -86,35 +115,6 @@ pkg_setup() {
                        --without-nss-libs --without-nss-includes"
        fi
 
-       if use krb4 && ! built_with_use virtual/krb5 krb4; then
-               ewarn
-               ewarn "In order to add kerberos 4 support, you have to emerge"
-               ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
-               ewarn
-               ewarn "Skipping for now."
-               ewarn
-               G2CONF="${G2CONF} --without-krb4"
-       else
-               G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
-       fi
-}
-
-src_unpack() {
-       unpack "${A}"
-       cd "${S}"
-
-       epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
-       # upstream gcc4 fix
-       epatch ${FILESDIR}/${PN}-1.2.3-gcc4.patch
-
-       # Resolve symbols at execution time for setgid binaries
-       epatch ${FILESDIR}/${PN}-no_lazy_bindings.patch
-
-       export WANT_AUTOMAKE=1.7
-       automake || die "automake failed"
-}
-
-src_compile() {
        cd "${S}/libdb/dist"
        ./s_config || die