From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Tue, 15 Nov 2011 23:30:01 +0000 (+0000)
Subject: QA: eautoreconf should be before gnome2_src_prepare.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=89fad25855f0bfca431f3469e6b25447e929adc6;p=gentoo.git

QA: eautoreconf should be before gnome2_src_prepare.

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

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 0ceb6fbccc2d..18af3e911654 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/dia
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.132 2011/08/07 16:14:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.133 2011/11/15 23:30:01 tetromino Exp $
+
+  15 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> dia-0.97.1.ebuild:
+  QA: eautoreconf should be before gnome2_src_prepare.
 
   07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> dia-0.97.1.ebuild,
   +files/dia-0.97.1-libpng15.patch:
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 811b013ba86a..651586cb6c0c 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -5,13 +5,13 @@ AUX dia-0.97-acinclude-python-fixes.patch 2524 RMD160 0383fe7394fa1dc21fc734e390
 AUX dia-0.97.0-gnome-doc.patch 1961 RMD160 ccc2b5273b8fe030294041ca3277ad28cec8bea6 SHA1 13ee9f0923ecf48b5fbf3e5cf7448ea8985c4bfb SHA256 5a0161a8da6991c65eb85cda4fbb00e65d897a13ab17ca2d1924167d316fa7a6
 AUX dia-0.97.1-libpng15.patch 879 RMD160 6bfc79c1118de900f2b1cdfad47d82e0cb87cad7 SHA1 7006f1e537b35a49ad7af8788826a2f00d426e7c SHA256 8a3210af5b6d12be6422465d85ce67be048483dee1f57d61d6dcc6e4d5c79cb2
 DIST dia-0.97.1.tar.bz2 6836081 RMD160 e6c3cd2872aa7d0bd8ffa502577027d7f45c8982 SHA1 ea35e0e0f2f75b69e22faa38968e0803a8ab4f47 SHA256 8dfe8b2c9d87baf29834c8de5e3ec91497c2b17f2b77fb1b867afddf5c429142
-EBUILD dia-0.97.1.ebuild 3114 RMD160 4a7f81ec69f811936ceea193768e55657b3974b2 SHA1 0e9e9d2d60053725d7696e196f63624acc2b777f SHA256 8bb326624bae771b09a09c0b0d1112dbf5ad0030db14f5ec8fe7a35316e3d8f3
-MISC ChangeLog 17522 RMD160 1e54928745294d93a70aa7d7d698fd39645f94bb SHA1 63e5cd14cbb7f481a035481cfcd1d0d5152311a2 SHA256 0718a9aabcdddf66cb42d23e44d7ba318d88a5dca7437e2e7d3d624243aaeb99
+EBUILD dia-0.97.1.ebuild 3113 RMD160 e5a9514e488a53252078768a3776c014b9041c76 SHA1 4d33ef2632c182d267c7384a816e05d07f8d7d08 SHA256 6c959a90aa9adc625cd4ca87db32d027ade255a89d8c33011f386cd749ccf172
+MISC ChangeLog 17656 RMD160 656db34839127845b735e0e5cf1d0ede9978c818 SHA1 fbe2088c0bf6ac985908a8486b9168d4655a1a3c SHA256 378e42d787fdaf414ecaa48748469c294d3966936c2495df5e764974068e3acd
 MISC metadata.xml 578 RMD160 f6c695b300f590287280f5d79e363e83e4f066d7 SHA1 a621978dd1772191b84c756071af83cea2e76436 SHA256 9f701216a4674db9adcda07b71c272954d60cbb8764e09052db999436287766c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4+uTwACgkQXkR9YqOcLPHTpQEAgiaRBXrv/G96aISlCAvXPTba
-IViQX80oUbNaGecZwLcA/iXLaBFYjDWga+i9mJ5l+c3IoiAf4eVhYYfp8hWdqwbR
-=K1bR
+iF4EAREIAAYFAk7C9f8ACgkQdjK8w9WeBnDHVQEAgCJ0sgg4OBi7KfqthdYeM7SG
+eGPYRnMJ6BmM80U+y44A/A5J41iYszkAc0Hfwf+QZThMiSBt+tNcH/OfOXc3QKf9
+=AK/+
 -----END PGP SIGNATURE-----
diff --git a/app-office/dia/dia-0.97.1.ebuild b/app-office/dia/dia-0.97.1.ebuild
index 29b2321b454e..d2fe57b81fc0 100644
--- a/app-office/dia/dia-0.97.1.ebuild
+++ b/app-office/dia/dia-0.97.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.13 2011/08/07 16:14:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.14 2011/11/15 23:30:01 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -66,8 +66,6 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libpng15.patch
 
-	gnome2_src_prepare
-
 	# Fix compilation in a gnome environment, bug #159831
 	epatch "${FILESDIR}/${PN}-0.97.0-gnome-doc.patch"
 
@@ -95,6 +93,7 @@ src_prepare() {
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+	gnome2_src_prepare
 }
 
 src_install() {