Bumped to using automake 1.7 so it builds with newer gnome and use eautoreconf from the autotools eclass

(Portage version: 2.0.54)

3 files changed, 19 insertions, 22 deletions

diff --git a/net-im/gnome-jabber/ChangeLog b/net-im/gnome-jabber/ChangeLog
index 1fe32ffe2725..489aeb14dc97 100644
--- a/net-im/gnome-jabber/ChangeLog
+++ b/net-im/gnome-jabber/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gnome-jabber
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnome-jabber/ChangeLog,v 1.15 2005/11/07 13:45:28 tester Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnome-jabber/ChangeLog,v 1.16 2006/02/25 00:08:31 tester Exp $
+
+  25 Feb 2006; Olivier Crête <tester@gentoo.org> gnome-jabber-0.4.ebuild:
+  Bumped to using automake 1.7 so it builds with newer gnome and use
+  eautoreconf from the autotools eclass
 
   07 Nov 2005; Olivier Crête <tester@gentoo.org> -gnome-jabber-0.3.ebuild,
   gnome-jabber-0.4.ebuild:
diff --git a/net-im/gnome-jabber/Manifest b/net-im/gnome-jabber/Manifest
index 7f021424d4b6..716d54d097da 100644
--- a/net-im/gnome-jabber/Manifest
+++ b/net-im/gnome-jabber/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 77f4ba5a09cc78414c6ccaa1c9009ae5 metadata.xml 307
-MD5 4a88047eabb1308d7653193927ab8154 gnome-jabber-0.4.ebuild 894
 MD5 097aa4c58d5e9372e146ceb0f986d45d ChangeLog 1762
 MD5 543866fd9af3f574893bfe190c1d65bb files/digest-gnome-jabber-0.4 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDb1qHmOfEJZHYOKcRAhf9AJ4yG0BkpjrVMotbzYgi8Tt6+0kAaACgjSiS
-6936BpsIOqgNDtz4hfKm2yM=
-=95VO
------END PGP SIGNATURE-----
+MD5 c472144ea0a7d88520bc4228250467f8 gnome-jabber-0.4.ebuild 867
+MD5 77f4ba5a09cc78414c6ccaa1c9009ae5 metadata.xml 307
diff --git a/net-im/gnome-jabber/gnome-jabber-0.4.ebuild b/net-im/gnome-jabber/gnome-jabber-0.4.ebuild
index 3b4d6ad9f44d..3c84710d82e2 100644
--- a/net-im/gnome-jabber/gnome-jabber-0.4.ebuild
+++ b/net-im/gnome-jabber/gnome-jabber-0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnome-jabber/gnome-jabber-0.4.ebuild,v 1.13 2005/11/07 13:45:28 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnome-jabber/gnome-jabber-0.4.ebuild,v 1.14 2006/02/25 00:08:31 tester Exp $
 
-inherit gnome2
+inherit gnome2 autotools
 
 DESCRIPTION="Gnome Jabber Client"
 SRC_URI="mirror://sourceforge/gnome-jabber/${P}.tar.bz2"
@@ -13,14 +13,17 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc amd64 ~ppc"
 IUSE=""
 
-DEPEND=">=x11-libs/gtk+-2.0.4
+RDEPEND=">=x11-libs/gtk+-2.0.4
 	>=gnome-base/libgnomeui-2.0.0
 	>=gnome-base/libglade-2.0.0
 	>net-libs/gnet-2
 	>=gnome-base/gconf-2.0
 	>=dev-libs/libxml2-2.4.23
-	sys-devel/gettext
-	>=dev-util/intltool-0.29"
+	sys-devel/gettext"
+
+DEPEND=">=sys-devel/automake-1.7
+	>=dev-util/intltool-0.29i
+	${RDEPEND}"
 
 DOCS="AUTHORS COPYING ChangeLog README NEWS TODO"
 
@@ -28,6 +31,6 @@ src_unpack () {
 	unpack ${A}
 	cd ${S}
 	sed -i -e 's:/usr/local:/usr:g' gnome-jabber.schemas.in
-	intltoolize -f && aclocal && autoconf && automake -a &&
-	libtoolize --force --copy || die
+	intltoolize -f || die
+	WANT_AUTOMAKE=1.7 eautoreconf
 }