Fixed configure.in and rebuilding autotoolchain stuff during the build now.

5 files changed, 44 insertions, 6 deletions

diff --git a/app-cdr/gtoaster/ChangeLog b/app-cdr/gtoaster/ChangeLog
index 7f86baf6141b..38d9da1814fa 100644
--- a/app-cdr/gtoaster/ChangeLog
+++ b/app-cdr/gtoaster/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/gtoaster
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/ChangeLog,v 1.9 2003/02/12 03:06:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/ChangeLog,v 1.10 2003/10/18 19:20:10 raker Exp $
+
+  18 Oct 2003; Nick Hadaway <raker@gentoo.org> files/configure.in.diff,
+  gtoaster-1.0_beta6.ebuild:
+  Fixed configure.in and rebuilding the autotoolchain stuff.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/app-cdr/gtoaster/Manifest b/app-cdr/gtoaster/Manifest
index fb0e164798c6..07806eb690e1 100644
--- a/app-cdr/gtoaster/Manifest
+++ b/app-cdr/gtoaster/Manifest
@@ -1,7 +1,9 @@
-MD5 4fc303cdd40ac64ef99a19c074cce620 ChangeLog 1617
 MD5 1f1fa4fad89e57159453166ed7e5c3c5 gtoaster-1.0_beta5.ebuild 2051
-MD5 6a463a8c94bbec934236178a4c99126f gtoaster-1.0_beta6.ebuild 1831
+MD5 22ae149d8509efa24a12d5c0d2fe7c29 gtoaster-1.0_beta6.ebuild 2003
+MD5 bee33a94c5c1429a9e806dc6eebd72b1 ChangeLog 1780
+MD5 12158b386c76f1fa317b9b474abfb30e metadata.xml 249
+MD5 1eb3e66bb9f6f444be6ec2491ecc587a files/scdtosr.diff 1751
+MD5 30354196151aa6af726ca19e9be520e5 files/configure.in.diff 404
 MD5 f29c8c012430473af4c8b82540fadb00 files/digest-gtoaster-1.0_beta5 65
 MD5 a44a9ce80bffcb13addfcf732f0b3a99 files/digest-gtoaster-1.0_beta6 66
 MD5 a2a4b20cf33b0568ce0660c3b2ad50f0 files/gtoaster.desktop 161
-MD5 1eb3e66bb9f6f444be6ec2491ecc587a files/scdtosr.diff 1751
diff --git a/app-cdr/gtoaster/files/configure.in.diff b/app-cdr/gtoaster/files/configure.in.diff
new file mode 100644
index 000000000000..d43b5992d160
--- /dev/null
+++ b/app-cdr/gtoaster/files/configure.in.diff
@@ -0,0 +1,13 @@
+--- configure.in	2003-10-18 12:28:44.981974040 -0500
++++ configure.in.modified	2003-10-18 12:25:14.011129504 -0500
+@@ -228,9 +228,7 @@
+ AC_SUBST(localedir)
+ 
+ AC_OUTPUT([Makefile m4/Makefile  intl/Makefile  po/Makefile.in 
+-          po/Makefile.in
+-			 gtoaster.spec
+-	  intl/Makefile],
++		gtoaster.spec],
+ 	  [touch Makefile.in
+ 	  sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in >po/Makefile]
+ 	  )
diff --git a/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild b/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild
index 15b3da5e91ed..d1d1be0a44b2 100644
--- a/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild
+++ b/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild,v 1.11 2003/10/01 09:27:33 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild,v 1.12 2003/10/18 19:20:10 raker Exp $
+
+IUSE="nls esd gnome oss oggvorbis"
 
 # Fix so that updating can only be done by 'cp old.ebuild new.ebuild'
 MY_P="`echo ${P} |sed -e 's:-::' -e 's:_b:B:'`"
@@ -13,7 +15,6 @@ HOMEPAGE="http://gnometoaster.rulez.org/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc "
-IUSE="nls esd gnome oss oggvorbis"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2 )
@@ -32,10 +33,12 @@ RDEPEND="=x11-libs/gtk+-1.2*
 src_unpack() {
 	unpack ${A} ; cd ${S}
 	epatch ${FILESDIR}/scdtosr.diff
+	epatch ${FILESDIR}/configure.in.diff
 }
 
 src_compile() {
 	local myconf=""
+
 	use nls	|| myconf="$myconf --disable-nls"
 
 	use gnome \
@@ -50,7 +53,14 @@ src_compile() {
 		&& myconf="$myconf --with-oss" \
 		|| myconf="$myconf --without-oss"
 
+	touch configure
+	touch `find . -name \*.m4`
+	touch `find . -name \*.in`
+	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOMAKE_1_4=1
+
 	econf ${myconf}
+
 	emake || die "parallel make failed"
 }
 
diff --git a/app-cdr/gtoaster/metadata.xml b/app-cdr/gtoaster/metadata.xml
new file mode 100644
index 000000000000..033a4005ef9c
--- /dev/null
+++ b/app-cdr/gtoaster/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>raker@gentoo.org</email>
+  <name>Nick Hadaway</name>
+</maintainer>
+</pkgmetadata>