Leaving debug handling to gnome2.eclass, bug #434736. Move pkg_setup to src_configure to avoid overhead with binpkg setup.

Package-Manager: portage-2.2.0_alpha125/cvs/Linux x86_64

3 files changed, 33 insertions, 25 deletions

diff --git a/net-libs/loudmouth/ChangeLog b/net-libs/loudmouth/ChangeLog
index 1ecedcaff623..f0b58f8912c4 100644
--- a/net-libs/loudmouth/ChangeLog
+++ b/net-libs/loudmouth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/loudmouth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.109 2012/08/05 20:50:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.110 2012/09/11 18:36:21 eva Exp $
+
+  11 Sep 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  loudmouth-1.4.3-r2.ebuild:
+  Leaving debug handling to gnome2.eclass, bug #434736. Move pkg_setup to
+  src_configure to avoid overhead with binpkg setup.
 
   05 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
   loudmouth-1.4.3-r2.ebuild:
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 2e9e7efb7b6a..c5d0b3588733 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -11,14 +11,14 @@ AUX loudmouth-1.4.3-gnutls28.patch 703 SHA256 6b74102efa1673fd57fbad52682cd002e4
 AUX loudmouth-1.4.3-id-tag-in-opening-headers.patch 1144 SHA256 02ae7062fa8bd5dc0ce21b973b8f3d25d04740c9dd8952e46d4200bfe393f13f SHA512 f4207619acf0ed3a6cda381eac7ec8aeeac06e94019ed5883a2d1976705afbe02cfb6a2ad99ab35580d710fcc53c7646b378cae23f1c454daf7a922596b8d02d WHIRLPOOL 6c252862fa85689b0ba7a1a6a1ae522161eeb7234140ebc685f425c13ab9ac9b74108a3ca89aa769d8269688084654af04396c7fabfc470eab95501733b36159
 AUX loudmouth-1.4.3-invalid-unicode.patch 4085 SHA256 1dd5eb99c8ce01ed98b0c01bb3b5494a84ac9382f0687669755ee40b0ffdbc0e SHA512 c622f19321f4316a13608c14e6b3ddc0c9bd1aa8668a08557dc5791c6d157224285d240696ee6b2ca9868cabb8f73bd764be00dcddcb7fffd2949d757bfbb77c WHIRLPOOL 5d963e7220909924882cfcce1b428c96728d45503e29b9783e471682e45ba6a22c89ef14f5f3379216de135329d44a8e120d8baeceb02357eea655f0db4c87bd
 AUX loudmouth-1.4.3-silence-chdir.patch 891 SHA256 663edc91b0a0e996d665334c132df7f7003033ded5e52e29461601eccc5ffdd0 SHA512 9fb9c7af6ee0cf82ad667949e73dff0688b0cd3cc1b47fa38ff2bd9b57ded8e7ca8d79d15597ef06257b1e34e77a47f3e490b133dbd23b30dfed43c5205bc450 WHIRLPOOL de9ef2a27c348099cdc16b66d45da209cf1434ad067d99f3bba786b734e8f317d4a11de9908c22b045a00a85faae2e935dc93c04c7547749f5eb3d66b7e79605
-DIST loudmouth-1.4.3.tar.bz2 366818 RMD160 59852d085f73d68b3c061b7192a484527843e67d SHA1 55dd0475760f98ff0ba1f5c712c52ab776b432be SHA256 95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3
-EBUILD loudmouth-1.4.3-r2.ebuild 2522 SHA256 65d347c16d352a7f2172fd282619b5d2c076e3a60f22ef7d12e0d887a7ba3146 SHA512 e62988f9926f423c290fa7aff38c24206d3a1f33f620486012e1cb21a6e522e7f14e81887919f64065c219b198174b01957432d5ffd94cb3e9bbd7f337754f40 WHIRLPOOL 5660f1dccf6cd6363bd5a59de067c070f67b5e4259fdf80487acea6325b710ab3bef5f0ab28dddccad136333044e8e7c9673bb37c25d21465f38b3b4a451feec
-MISC ChangeLog 14759 SHA256 51f871b1752a11e4e7296b4b7d5c27ed7b3473d88a3c5a41103063fdce165dad SHA512 62c79ce0003ae905b33641110e2f2ac5c38d401a9100c6061eb5ed2366f3cb198432fcf6aff2b522f6ca944a9f8c33fcde661fee40d7312ec41f6f6075e22de3 WHIRLPOOL db173c6bc527cefbef958874e740e9a989f7c0864abf63eab6206278e41d2f9af19830cbd2fd896e0d1d60ef64a0f4634fa55f3c3bf5446dca5cdfd2c6d0910c
+DIST loudmouth-1.4.3.tar.bz2 366818 SHA256 95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3 SHA512 02d1de14a4d626a4c9100bd24c06d4b4203eabb0f95bab40ee18ea5e68ed81d47aa977625140157b2d9f7974ac748af857c2ee3a916f0db700e2a2d0934940ec WHIRLPOOL 4f9e3e8e4f2fd0a36996e84deebeb26c789d5334af11a3d6cc6c742b59508945a6279715f6fbb02bbbc04a0d9709e7aae4cc39803b2a60acfd47d76f0482f969
+EBUILD loudmouth-1.4.3-r2.ebuild 2592 SHA256 8a1b042471a586e50b38d7c25a9bc7d386a70714c317bb73fe813973b4617681 SHA512 6199851bbb4af77f58824af753b48a901e479c9a951ebabc0f7b15fd7b47ea02c509bdb0bd06170de9b854b7d4a5fb7048d7a6242023ba033cf12bb6c321c69b WHIRLPOOL 3d913b08fcc006ba6631ad966e7a1803470cce17265e24d82226095138f8fab72a327d1cf56073f561545049436a4cc8b50e7dbf495e5653b4c546ae4dd657da
+MISC ChangeLog 14965 SHA256 48f67e469380b9a63eaf4e728dee0697745709217a8cd61adadadedd9ff3a316 SHA512 f9ba06d4091f230a2ee6eed19d65bba7568b2c9da4d1759e11f22c24e3acc454167720eef0ce966abdaadd273c7c2b80ccfca9ac0b5d761764fbe2f323b002ae WHIRLPOOL 8c6742f5254a6a54a334cc5bedae634085f6fea39a17dfa5994f94ff25ee579a028d919edf48a041f0bf292b92e8adba1debfbe230e59ee7d810836a595bfe3a
 MISC metadata.xml 258 SHA256 0db8d15e4fd277e63ff3200516092f2cc3ab46da07da76e5e7baf37937a734c5 SHA512 098bc597d48de5123e90a88f8b01b7dd4625cab55859e669d56c2368156c7389b11e95601c5ca5beff48d67c470fff76a4823da2d89378523717f4d43a348630 WHIRLPOOL a46a44f6d85dbe8f8a7b8309bd5c2d258026486a549ca394fe38aed654c604cfa18c90b2ca0d5236d10cea441df09ea32141b59f62f7485c01ded0f5ee7e112d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAe3I0ACgkQl5yvQNBFVTWA0QCeMDiCggd74oF7AxnyOhFnyL8J
-9CkAn1Ky88JcTfvMUEjIVuC8lVfxfZPk
-=2ZDp
+iEYEAREIAAYFAlBPhLAACgkQ1fmVwcYIWAbZMwCfcA/rcMbTuvn51CWztpHLuFJ5
+RYcAn0zr/Gs++4EHeuyns6NIlI99QyrA
+=vfKb
 -----END PGP SIGNATURE-----
diff --git a/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild b/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild
index 5032af2fadb5..609bfd8185af 100644
--- a/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild,v 1.12 2012/08/05 20:50:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild,v 1.13 2012/09/11 18:36:21 eva Exp $
 
 EAPI="4"
 GNOME_TARBALL_SUFFIX="bz2"
 GNOME2_LA_PUNT="yes"
+# Not using gnome macro, but behavior is similar, #434736
+GCONF_DEBUG="yes"
 
 inherit autotools eutils gnome2
 
@@ -15,7 +17,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~ppc-macos"
 
-IUSE="asyncns debug doc ssl static-libs test"
+IUSE="asyncns doc ssl static-libs test"
 
 # Automagic libidn dependency
 RDEPEND=">=dev-libs/glib-2.4
@@ -33,22 +35,6 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable debug) $(use_enable static-libs static)"
-
-	if use ssl; then
-		G2CONF="${G2CONF} --with-ssl=gnutls"
-	else
-		G2CONF="${G2CONF} --with-ssl=no"
-	fi
-
-	if use asyncns; then
-		G2CONF="${G2CONF} --with-asyncns=system"
-	else
-		G2CONF="${G2CONF}  --without-asyncns"
-	fi
-}
-
 src_prepare() {
 	# Use system libasyncns, bug #236844
 	epatch "${FILESDIR}/${P}-asyncns-system.patch"
@@ -87,3 +73,20 @@ src_prepare() {
 	eautoreconf
 	gnome2_src_prepare
 }
+
+src_configure() {
+	G2CONF="${G2CONF} $(use_enable static-libs static)"
+
+	if use ssl; then
+		G2CONF="${G2CONF} --with-ssl=gnutls"
+	else
+		G2CONF="${G2CONF} --with-ssl=no"
+	fi
+
+	if use asyncns; then
+		G2CONF="${G2CONF} --with-asyncns=system"
+	else
+		G2CONF="${G2CONF} --without-asyncns"
+	fi
+	gnome2_src_configure
+}