minor buildfix, mark 1.0.5-r2 x86

6 files changed, 20 insertions, 49 deletions

diff --git a/app-text/gnome-spell/ChangeLog b/app-text/gnome-spell/ChangeLog
index b5224bb46ba9..7636305a9d95 100644
--- a/app-text/gnome-spell/ChangeLog
+++ b/app-text/gnome-spell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/gnome-spell
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-spell/ChangeLog,v 1.45 2004/06/15 19:49:46 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-spell/ChangeLog,v 1.46 2004/06/22 12:52:54 foser Exp $
+
+*gnome-spell-1.0.5-r2 (22 Jun 2004)
+
+  22 Jun 2004; foser <foser@gentoo.org> gnome-spell-1.0.5*.ebuild :
+  Add WANT_AUTOMAKE=1.4 statement to ensure it picks the right one (#54110)
 
   15 Jun 2004; Travis Tilley <lv@gentoo.org> gnome-spell-1.0.5-r2.ebuild:
   stable on amd64
diff --git a/app-text/gnome-spell/Manifest b/app-text/gnome-spell/Manifest
index 58533d275e4b..48eb5ea11a4d 100644
--- a/app-text/gnome-spell/Manifest
+++ b/app-text/gnome-spell/Manifest
@@ -1,14 +1,12 @@
-MD5 8a8a4ab281d35ff97d91008a65a96b97 ChangeLog 6157
-MD5 0d9ecdbdfc4c2234bba0a8a763edf5b6 gnome-spell-0.5.ebuild 1106
-MD5 c55c5b2793bb2844ba88fd2e9874fcb0 gnome-spell-1.0.4.ebuild 906
+MD5 b1ec986e7d3ddae3ad5ce0717840079f gnome-spell-1.0.5-r1.ebuild 933
+MD5 c91a3922a1f0d96151998f48f0be8d1a gnome-spell-0.5.ebuild 1105
 MD5 b9b0b7266a513827ca97ab951a3716f3 gnome-spell-1.0.5.ebuild 1073
+MD5 d4debde58370b6f5677ae7647831d71f gnome-spell-1.0.5-r2.ebuild 992
+MD5 ae277002d30e927fc148ff134fb16522 ChangeLog 6342
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 475a7ec683778aa7545c9379e280995e gnome-spell-1.0.5-r1.ebuild 917
-MD5 b76442d4ce331350ad0e6e175710a491 gnome-spell-1.0.5-r2.ebuild 970
-MD5 c9d55e535778f7a2386f5bba1c2cfcf7 files/digest-gnome-spell-0.5 68
-MD5 d7a3ea11abf9781f4dbfca9c0b6cfecb files/digest-gnome-spell-1.0.4 70
 MD5 959c92eeb724ca5380e81f09805df109 files/digest-gnome-spell-1.0.5 70
-MD5 959c92eeb724ca5380e81f09805df109 files/digest-gnome-spell-1.0.5-r1 70
+MD5 b0296719b38481284f42227002eeb1a4 files/gnome-spell-1.0.5-gtk24.patch 13886
 MD5 a2f04eb1ad051e0c06e703901869afca files/gnome-spell-1.0.5-enchant.patch 18757
+MD5 959c92eeb724ca5380e81f09805df109 files/digest-gnome-spell-1.0.5-r1 70
 MD5 959c92eeb724ca5380e81f09805df109 files/digest-gnome-spell-1.0.5-r2 70
-MD5 b0296719b38481284f42227002eeb1a4 files/gnome-spell-1.0.5-gtk24.patch 13886
+MD5 c9d55e535778f7a2386f5bba1c2cfcf7 files/digest-gnome-spell-0.5 68
diff --git a/app-text/gnome-spell/files/digest-gnome-spell-1.0.4 b/app-text/gnome-spell/files/digest-gnome-spell-1.0.4
deleted file mode 100644
index 22d410154c11..000000000000
--- a/app-text/gnome-spell/files/digest-gnome-spell-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d991c1791fdc58d38d514752daf92330 gnome-spell-1.0.4.tar.bz2 212842
diff --git a/app-text/gnome-spell/gnome-spell-1.0.4.ebuild b/app-text/gnome-spell/gnome-spell-1.0.4.ebuild
deleted file mode 100644
index d5dbcdf2e081..000000000000
--- a/app-text/gnome-spell/gnome-spell-1.0.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-spell/gnome-spell-1.0.4.ebuild,v 1.9 2004/06/17 02:01:40 mr_bones_ Exp $
-
-IUSE=""
-
-inherit gnome.org gnome2 libtool debug # because this an unstable package
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Gnome spellchecking component."
-HOMEPAGE="http://www.gnome.org/"
-
-KEYWORDS="x86 ~sparc ~ppc ~alpha hppa"
-SLOT="1"
-LICENSE="GPL-2"
-
-RDEPEND=">=gnome-base/libgnomeui-2.2
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libbonobo-2.0
-	>=gnome-base/ORBit2-2.0
-	virtual/aspell-dict"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	>=dev-lang/perl-5.6.0"
-
-# the control-center capplet seems to be missing
-# so gnome-base/control-center-2.0 dep removed
-
-DOCS="AUTHORS COPYING ChangeLog NEWS README"
-SCROLLKEEPER_UPDATE="0"
diff --git a/app-text/gnome-spell/gnome-spell-1.0.5-r1.ebuild b/app-text/gnome-spell/gnome-spell-1.0.5-r1.ebuild
index f07bf7feb8ee..ce14c6c0e011 100644
--- a/app-text/gnome-spell/gnome-spell-1.0.5-r1.ebuild
+++ b/app-text/gnome-spell/gnome-spell-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-spell/gnome-spell-1.0.5-r1.ebuild,v 1.7 2004/04/08 17:19:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-spell/gnome-spell-1.0.5-r1.ebuild,v 1.8 2004/06/22 12:52:54 foser Exp $
 
 inherit gnome.org gnome2 libtool eutils
 
@@ -32,5 +32,5 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-enchant.patch
 
 	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-	automake || die "automake failed"
+	WANT_AUTOMAKE=1.4 automake || die "automake failed"
 }
diff --git a/app-text/gnome-spell/gnome-spell-1.0.5-r2.ebuild b/app-text/gnome-spell/gnome-spell-1.0.5-r2.ebuild
index 085383ef34a6..a47de90f2d31 100644
--- a/app-text/gnome-spell/gnome-spell-1.0.5-r2.ebuild
+++ b/app-text/gnome-spell/gnome-spell-1.0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-spell/gnome-spell-1.0.5-r2.ebuild,v 1.4 2004/06/15 19:49:46 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-spell/gnome-spell-1.0.5-r2.ebuild,v 1.5 2004/06/22 12:52:54 foser Exp $
 
 inherit gnome.org gnome2 libtool eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa amd64"
+KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa amd64"
 
 RDEPEND=">=gnome-base/libgnomeui-2.2
 	>=gnome-base/libbonoboui-2.0
@@ -27,11 +27,13 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 src_unpack() {
+
 	unpack ${A}
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-enchant.patch
 	epatch ${FILESDIR}/${P}-gtk24.patch
 	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-	automake || die "automake failed"
+	WANT_AUTOMAKE=1.4 automake || die "automake failed"
+
 }