From b0580bd145b1d587cde0028f5383296d4e051b14 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Tue, 15 Nov 2011 23:20:08 +0000 Subject: [PATCH] QA: eautoreconf should be before gnome2_src_prepare. Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64 --- app-text/evince/ChangeLog | 6 +++++- app-text/evince/Manifest | 12 ++++++------ app-text/evince/evince-2.32.0-r2.ebuild | 5 ++--- app-text/evince/evince-2.32.0-r3.ebuild | 5 ++--- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog index af6db86fe938..2c1ccc572295 100644 --- a/app-text/evince/ChangeLog +++ b/app-text/evince/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/evince # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.230 2011/11/03 05:31:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.231 2011/11/15 23:20:08 tetromino Exp $ + + 15 Nov 2011; Alexandre Rostovtsev + evince-2.32.0-r2.ebuild, evince-2.32.0-r3.ebuild: + QA: eautoreconf should be before gnome2_src_prepare. *evince-3.2.1 (03 Nov 2011) diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest index f2c3a4e7ee7c..08038ffa928b 100644 --- a/app-text/evince/Manifest +++ b/app-text/evince/Manifest @@ -14,15 +14,15 @@ AUX evince-2.32.0-use-popup.patch 766 RMD160 9260e11fae9fa98cc739602a308793199bc AUX gconf-2.m4 1579 RMD160 48aa5e5e77d4c024efb70b643403bec8969fe815 SHA1 5e3c4701f63b1b4614f48d94d03440af7155f119 SHA256 2c9a981afe5bba4486c8e0ddb66433aef4af953168bd254f6a5ba1c6692f80f8 DIST evince-2.32.0.tar.bz2 2295272 RMD160 a2d52685ac119b70cf40f320de457b3dfbac2587 SHA1 2f06a2b9dfd8667f4b4c6e90be3c49f6fe026fc8 SHA256 2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7 DIST evince-3.2.1.tar.xz 3782932 RMD160 74a81f8970542c46717ea47243973cb81dbc4ee8 SHA1 993610957907df22677dab6f46648edf4b998c8f SHA256 9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35 -EBUILD evince-2.32.0-r2.ebuild 3834 RMD160 929684ca7149e1c47220d8fd46b4a4b3f4314a94 SHA1 67b0efc15d2f38b16d295f2b9c00d54a0423ecfb SHA256 2ec1e71428c961ce2c8caf456764380e7dfb24f9d8043cb4630f99aec1826337 -EBUILD evince-2.32.0-r3.ebuild 4152 RMD160 7c723d0666e599806e8352fda6a36db55680e0ba SHA1 614bfae6dcd1c5081bb96432f9ce0b48919bb84d SHA256 fa06ef00327cf19e578648844a60742eb9fc93d2133c33c7f2995648c6f43e83 +EBUILD evince-2.32.0-r2.ebuild 3832 RMD160 83b4b548ad9b2e6e510aac685a7f163fd33a62e7 SHA1 f430b775fb64cf41ebfe21c9c9b82317ec29d180 SHA256 acfd6d03c86fbc33d55604966094fef6826935aeb6a53ab031de55353eb53901 +EBUILD evince-2.32.0-r3.ebuild 4156 RMD160 84cc3fa9ba1cc5f2b69080346ff56acc165808de SHA1 6fa450c70359a4f5387e69244ee87e9c2504a7c3 SHA256 6eb947ae88c239c9fa1350164274f6b02ae0710adfa24f6262961651dd5f7114 EBUILD evince-3.2.1.ebuild 2927 RMD160 14f6d67b54edb00239e8836e2c27dbb8a43e5ad9 SHA1 f705e653f4030e523b3ae68d61dcd2066faef814 SHA256 62fc7d283e420298e66c1c6714cbf7e0d7e833a741ce1ac06e039ee3b5700827 -MISC ChangeLog 33830 RMD160 e3a57a340f0cab7edd738c5b7c1d98fe8af5d701 SHA1 ef449ee6423e261e71dde896c4a60aaad58bebef SHA256 26e65b83b81419d5c0b05da48bb708e28bf221500205edc8ec5ada0c042ddcea +MISC ChangeLog 33997 RMD160 6b1816659dbb61725065ae6c1255e9e660b164a9 SHA1 bc0fa8de02516cb941332615c78be875d6560543 SHA256 d54926680760ff078b001678c605001d2ed9ed64b61bf1185423e3d5d2e3f850 MISC metadata.xml 788 RMD160 ddf6d5febf8fc7ac34fb1635150d00a776868307 SHA1 733f3038b004e15b00ff9f6d5735bc0e48da9112 SHA256 0a7faaea7094f6abb9429988ccea9ba62daa7c251b894da77d3c38dc3d9b0f6a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6yJ1UACgkQdjK8w9WeBnAZjQEAp5m/+BmbaG6mJDp4T63G28fq -L+DlOyKFLD+lRbDrQgQBAKPKoGna7Rfaf9Qg0EBuqUJ3lWZzuHedFtdJ5wszyq5q -=ZaPF +iF4EAREIAAYFAk7C864ACgkQdjK8w9WeBnC6xgEAqkF81VRxGkL338clcLtAsaX7 +JQTD8J6uXi86rjhJ1g0A/2XdcOKV4TYp2CHVgvfhRXwZLH+FYiGKzHwdM+hJDYxU +=YHer -----END PGP SIGNATURE----- diff --git a/app-text/evince/evince-2.32.0-r2.ebuild b/app-text/evince/evince-2.32.0-r2.ebuild index 777bf128644f..b9caa4eabded 100644 --- a/app-text/evince/evince-2.32.0-r2.ebuild +++ b/app-text/evince/evince-2.32.0-r2.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-text/evince/evince-2.32.0-r2.ebuild,v 1.7 2011/04/26 11:18:18 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r2.ebuild,v 1.8 2011/11/15 23:20:08 tetromino Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -84,8 +84,6 @@ pkg_setup() { } src_prepare() { - gnome2_src_prepare - # Check for NULL in synctex_backward_search preventing segfault, upstream bug #630845 epatch "${FILESDIR}"/${P}-libdocument-segfault.patch @@ -121,6 +119,7 @@ src_prepare() { intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf + gnome2_src_prepare } src_install() { diff --git a/app-text/evince/evince-2.32.0-r3.ebuild b/app-text/evince/evince-2.32.0-r3.ebuild index 4a0aee84211c..d507e5f60d33 100644 --- a/app-text/evince/evince-2.32.0-r3.ebuild +++ b/app-text/evince/evince-2.32.0-r3.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-text/evince/evince-2.32.0-r3.ebuild,v 1.8 2011/10/17 18:20:48 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r3.ebuild,v 1.9 2011/11/15 23:20:08 tetromino Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -84,8 +84,6 @@ pkg_setup() { } src_prepare() { - gnome2_src_prepare - # Check for NULL in synctex_backward_search preventing segfault, upstream bug #630845 epatch "${FILESDIR}"/${P}-libdocument-segfault.patch @@ -130,6 +128,7 @@ src_prepare() { intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf + gnome2_src_prepare } src_install() { -- 2.26.2