Run full eautoreconf, eautoconf alone won't work in some cases

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.28-rc4 x86_64

4 files changed, 27 insertions, 9 deletions

diff --git a/xfce-extra/exo/ChangeLog b/xfce-extra/exo/ChangeLog
index f15361b9fb0e..ebf049f86b09 100644
--- a/xfce-extra/exo/ChangeLog
+++ b/xfce-extra/exo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/exo
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.64 2008/11/14 01:56:09 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.65 2008/11/14 15:53:48 angelos Exp $
+
+  14 Nov 2008; Christoph Mende <angelos@gentoo.org> exo-0.3.4.ebuild,
+  exo-0.3.4-r1.ebuild:
+  Run full eautoreconf, eautoconf alone won't work in some cases
 
   14 Nov 2008; Jeremy Olexa <darkside@gentoo.org> exo-0.3.4-r1.ebuild:
   need autotooling after patching configure.in, bug #246480
diff --git a/xfce-extra/exo/Manifest b/xfce-extra/exo/Manifest
index 3c635f059835..f33ad10e5eb1 100644
--- a/xfce-extra/exo/Manifest
+++ b/xfce-extra/exo/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX exo-0.3.4-eject.patch 6692 RMD160 674aebb271c14f5cc1f1e285cea8fd4c4ad3d41f SHA1 4517c4226bdcdc5e325b7dfc56c500acd1f3b00f SHA256 cc4c3551a06b2161355956eced4345e5bdd50d738a8f8d22f0604d306234c289
 AUX exo-0.3.4-remove-libmd5.patch 1929 RMD160 5f60292142bddb195a0dfdb88fab2f546d7bc8d2 SHA1 89483f5851ab962fbea85dc1a7755c5a3cdea153 SHA256 b7898b1410d973a89c4137ec2972f3b88d17438a495065d19a5b0f7a1f8d1833
 DIST exo-0.3.4.tar.bz2 1300127 RMD160 e021f030a624c522c819ec0f3a8682a1007ae748 SHA1 4f7a3f46592fd0311be1f011f17431f211cc1fcb SHA256 a5373e9bd6055caa7cd5d06128f6236cfd2f4f6657ea4a85d7bd9eafe5bf0538
-EBUILD exo-0.3.4-r1.ebuild 1805 RMD160 f268851f64fe91e31c0d1c629658abcc3c7f52f1 SHA1 c1582d9c77ca043126ab85555395c42b6d33b727 SHA256 a9ec08c5d1c4b28566eb54b51ba19469a9b1b21d1b63a6af71ebe7cb778ae9e9
-EBUILD exo-0.3.4.ebuild 1658 RMD160 cee345212e1fede8c2bfe65d5b2993168339a432 SHA1 e9434b2f0652d2f4533eadd8c2a1e5503a54f17a SHA256 0d19ecd98a231cce45cf2fd73d1f2d02cd61538a52113ea775fbd9a80351ef05
-MISC ChangeLog 7831 RMD160 620afcebf98e8f91ef46a6f84bde7e252d4dce5c SHA1 4a9322e5c828edf0aa6acbb32d435a9b13193304 SHA256 591a77e0f5e93520eabb004b7018f419d81d264dec4e4759f9079986b12bf23f
+EBUILD exo-0.3.4-r1.ebuild 1827 RMD160 043d5cd790a87bc0722caea65aa219f9865698c8 SHA1 f4ac872d638df575bc7cd781e973bd1d47a61a04 SHA256 9eb2cf304fd842c4c117ef19ecc8386ec4ab74295ec21e33f1ee54667f62b37c
+EBUILD exo-0.3.4.ebuild 1773 RMD160 b946390694d324d2aeb36cf4adfc0789c259be96 SHA1 0995f1c1847b88f18072c08e4619ae9f578b0305 SHA256 216cdbbbc395523e78227e7a727bd5ccccec5c7d62a2514f70ca8a40b3d78ca3
+MISC ChangeLog 7989 RMD160 458eb0e3f2707c6fe418a28025744ca44cc4ab1e SHA1 3265c6b24234356c91467973fd668a78ce131968 SHA256 b20c2652a3abf060715bce53ac14028ccdd26426a123bb84a59bf8e00bbc3841
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkdnxwACgkQKhnDs22gwa+DPwCg3mh0j9SeZfpCi28k0I/SGtsy
+YjcAmgMACmU3fHF+vGbRxThhMaDrcZWj
+=QN1B
+-----END PGP SIGNATURE-----
diff --git a/xfce-extra/exo/exo-0.3.4-r1.ebuild b/xfce-extra/exo/exo-0.3.4-r1.ebuild
index 2721222bdb3a..888c39219e31 100644
--- a/xfce-extra/exo/exo-0.3.4-r1.ebuild
+++ b/xfce-extra/exo/exo-0.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.4-r1.ebuild,v 1.8 2008/11/14 01:56:09 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.4-r1.ebuild,v 1.9 2008/11/14 15:53:48 angelos Exp $
 
 inherit eutils xfce44 python multilib autotools
 
@@ -23,7 +23,9 @@ RDEPEND=">=dev-lang/perl-5.6
 	hal? ( >=sys-apps/hal-0.5.7.1 )
 	python? ( dev-python/pygtk )"
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	dev-util/pkgconfig
+	dev-util/xfce4-dev-tools
 	doc? ( dev-util/gtk-doc )
 	dev-util/intltool"
 
@@ -41,8 +43,7 @@ src_unpack() {
 	sed -i -e 's:-Werror::g' "${S}"/configure
 	epatch "${FILESDIR}"/${P}-eject.patch
 	epatch "${FILESDIR}"/${P}-remove-libmd5.patch
-	# eautoreconf would be preferred here but automake fails, bug #246480
-	eautoconf
+	AT_M4DIR=/usr/share/xfce4/dev-tools/m4macros eautoreconf
 }
 
 # See bug 164780 for reference
diff --git a/xfce-extra/exo/exo-0.3.4.ebuild b/xfce-extra/exo/exo-0.3.4.ebuild
index 8dc8161177ca..252ea9a49002 100644
--- a/xfce-extra/exo/exo-0.3.4.ebuild
+++ b/xfce-extra/exo/exo-0.3.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.4.ebuild,v 1.12 2008/11/10 19:32:53 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.4.ebuild,v 1.13 2008/11/14 15:53:48 angelos Exp $
 
-inherit eutils xfce44 python multilib
+inherit eutils xfce44 python multilib autotools
 
 XFCE_VERSION=4.4.2
 xfce44
@@ -23,7 +23,9 @@ RDEPEND=">=dev-lang/perl-5.6
 	hal? ( >=sys-apps/hal-0.5.7.1 )
 	python? ( dev-python/pygtk )"
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	dev-util/pkgconfig
+	dev-util/xfce4-dev-tools
 	doc? ( dev-util/gtk-doc )
 	dev-util/intltool"
 
@@ -38,6 +40,7 @@ src_unpack() {
 	unpack ${A}
 	sed -i -e 's:-Werror::g' "${S}"/configure
 	epatch "${FILESDIR}"/${P}-remove-libmd5.patch
+	AT_M4DIR=/usr/share/xfce4/dev-tools/m4macros eautoreconf
 }
 
 # See bug 164780 for reference