Move gnome2_src_prepare to proper place.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/gnome-extra/contacts/ChangeLog b/gnome-extra/contacts/ChangeLog
index 2e9aa02fa57ac9e477fa410c4600b7ff3b2574dc..2630c57af1ffbe7a259ffc859b4824659de3131b 100644 (file)
--- a/gnome-extra/contacts/ChangeLog
+++ b/gnome-extra/contacts/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/contacts
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/ChangeLog,v 1.12 2011/02/25 22:26:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/ChangeLog,v 1.13 2011/12/29 16:21:17 pacho Exp $
+
+  29 Dec 2011; Pacho Ramos <pacho@gentoo.org> contacts-0.12.ebuild:
+  Move gnome2_src_prepare to proper place.
 
   25 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org> contacts-0.12.ebuild:
   Fix incomplete rdepends and use switches, bug #356317.

diff --git a/gnome-extra/contacts/Manifest b/gnome-extra/contacts/Manifest
index 30d0da5b89b685a93fcdb6ec00b7c9869f7662d5..752c0b7cf9cc0388e6b05ecd8e1ae1f06e70ac1f 100644 (file)
--- a/gnome-extra/contacts/Manifest
+++ b/gnome-extra/contacts/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 AUX contacts-0.11-fix-make-3.82.patch 420 RMD160 877209e94417aa34dcf6666c5edea122e932c2ff SHA1 4dc29604471f9c351897c4f870475468a31d0218 SHA256 0af667f267304a0b7f02757e1e544533cef49affd2be9e3a0c0133e730f0f4d7
 AUX contacts-0.9-dbus.patch 604 RMD160 006a40a7a36791107313c36c7e86b7c99721b767 SHA1 676eb551d633f055c8346fd0d5481a1e0a3c019f SHA256 36a09da50e055f54786fc86f27a309a8d8be29c5cb53f9314ce3f856bdc37949
 DIST contacts-0.12.tar.bz2 358322 RMD160 ff12cc45280311437e79e53859ca12d441dc0248 SHA1 f836963997c9dbdb34a6491a9f5a5431375a710c SHA256 0993f34819b92e09ab64e8a90231afc3178a19a4a99cf02c3050f51a44850782
-EBUILD contacts-0.12.ebuild 1266 RMD160 ad6468759263fc78369c3e7b0791e9afd78e287d SHA1 8b759efd0f0c69ec103d1263af3c02bd4fe1492e SHA256 e073e1d7f80ec5248b2f5ebe80e339081cafc40f1c980891005eebbd2fe3b3cb
-MISC ChangeLog 2308 RMD160 7f63fd3ba7dc2d48a130de6ad80363643b23f0d6 SHA1 572cee9febe910dfd42ac404657583ba3c127287 SHA256 14bb7acb380bc7e9b5f528a62e7aec524c441370b2d8e3d699440f8676adf46a
+EBUILD contacts-0.12.ebuild 1294 RMD160 6e0f38a523d58e81846d8052b9d96e670237367c SHA1 3e183c96360fda81cf0620a3dcc769e285c8d36d SHA256 b446c3ed8283e5ebef75a9ab74a6c597ea561710e866a9d8177eb56eb3ea4033
+MISC ChangeLog 2422 RMD160 f36990cc6a18e6354c6f0136f9cb1f276b9202f0 SHA1 6568d529cb5f0eb797c161684c5e4c0605bfd9c3 SHA256 e1301aa00ba3c138b6134396cad40f751ad5f1d39840a197ffb282281d1268d1
 MISC metadata.xml 455 RMD160 a8c07efa1ed0ab081393acb3eb13369f7f0983e8 SHA1 36d621ad6b825117b64a79c9fa2bef5190e7a312 SHA256 eeca963fe71eee5d32bcd2958bacf4871edcdd7ac7cce7ab2cf88e4d70f9ff30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1oLLkACgkQ1fmVwcYIWAa0twCghrGhFrn8bwwPaKD1xcJU78Me
-Bd0AoMJkr43V7frUZOA69e9lSmskWXVI
-=+S8C
+iEYEARECAAYFAk78k4QACgkQCaWpQKGI+9ToPgCcCHDevyER2ZGeB5tP6ghqlWbp
+8dYAoIPZ1MTKhGOkgkicSw1dZCEXBaZo
+=qd0k
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/contacts/contacts-0.12.ebuild b/gnome-extra/contacts/contacts-0.12.ebuild
index ffc1b7e8392547b3aab068072156abbf30048297..f2d5676ef4e3ddb16c68b8f7b2fd73dd7b7101d3 100644 (file)
--- a/gnome-extra/contacts/contacts-0.12.ebuild
+++ b/gnome-extra/contacts/contacts-0.12.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/contacts-0.12.ebuild,v 1.3 2011/02/25 22:26:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/contacts-0.12.ebuild,v 1.4 2011/12/29 16:21:17 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit autotools eutils gnome2
 
@@ -38,8 +39,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       gnome2_src_prepare
-
        # Fix compilation with USE="-dbus", bug #247519, upstream bug #628614
        epatch "${FILESDIR}/${PN}-0.9-dbus.patch"
 
@@ -48,4 +47,5 @@ src_prepare() {
 
        intltoolize --force --copy --automake || die "intltoolize failed"
        eautoreconf
+       gnome2_src_prepare
 }