Prevent auto* from rerunning... closes bug #70379.

4 files changed, 24 insertions, 14 deletions

diff --git a/media-sound/aumix/ChangeLog b/media-sound/aumix/ChangeLog
index ebd2c21f7818..ac20891f9409 100644
--- a/media-sound/aumix/ChangeLog
+++ b/media-sound/aumix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/aumix
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.44 2004/11/08 23:30:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.45 2004/11/11 03:24:18 eradicator Exp $
+
+  10 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/aumix-2.8-nls.patch:
+  Prevent auto* from rerunning... closes bug #70379.
 
   08 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   -aumix-2.7-r4.ebuild, -aumix-2.8.ebuild:
diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
index 37a79387c2bd..9077a244dacc 100644
--- a/media-sound/aumix/Manifest
+++ b/media-sound/aumix/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 50d8dd2d2a3c0b7c31bd612d5bf43d70 ChangeLog 5363
+MD5 1b673750800ae9b9eb94093a3c63706f ChangeLog 5503
 MD5 1da36b17ad3de7a3dd66325a008acafd aumix-2.8-r1.ebuild 1534
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 aa4397899daf0e11a917658096feae7e aumix-2.8-r2.ebuild 1656
+MD5 3c5013d3668d6084c34047b9735d948c aumix-2.8-r2.ebuild 1853
 MD5 f39abfbf49ff4a33e109eeb14a4325c2 files/aumix.desktop 124
 MD5 8e3a1693ed2d3ff2941578494362b0a7 files/aumix.rc6 1140
 MD5 857a1fe260905ab09b7befd877affafd files/digest-aumix-2.8-r1 62
@@ -12,11 +12,11 @@ MD5 857a1fe260905ab09b7befd877affafd files/digest-aumix-2.8-r2 62
 MD5 6c8d691beb495257d8309e58c127acd2 files/aumix-2.8-nohome.patch 529
 MD5 00da88dc336799f1385f518dd005dd5a files/aumix-2.8-close-dialogs.patch 613
 MD5 221509621be1606c1a61dfc8fcd4991e files/aumix-2.8-save_load.patch 1331
-MD5 d9da97283ec0459e7981a3aea2557e42 files/aumix-2.8-nls.patch 829
+MD5 a685fd4f0649bfb0c7fd4860eda0caa7 files/aumix-2.8-nls.patch 829
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBkAGsArHZZzCEUG0RAqM9AJ9ZlK+A5FF+szao9r9O8APGsMFH6wCfQQeA
-y+foa+uq4mWD7QbhLqHjDTs=
-=mr4C
+iD8DBQFBkttrArHZZzCEUG0RAkRTAJ9V1VUPFvS2rYBS3d9LqBf5FcyX9QCdGenw
+3adhukhlyoyArk2tV7DcUkA=
+=si/C
 -----END PGP SIGNATURE-----
diff --git a/media-sound/aumix/aumix-2.8-r2.ebuild b/media-sound/aumix/aumix-2.8-r2.ebuild
index 6db2dbdbb458..0f9bdc0d350a 100644
--- a/media-sound/aumix/aumix-2.8-r2.ebuild
+++ b/media-sound/aumix/aumix-2.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.8-r2.ebuild,v 1.12 2004/11/08 15:27:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.8-r2.ebuild,v 1.13 2004/11/11 03:24:18 eradicator Exp $
 
 inherit eutils
 
@@ -16,12 +16,12 @@ IUSE="gtk gtk2 gpm nls"
 #alsa support is broken in 2.8	alsa? ( >=media-libs/alsa-lib-0.9.0_rc1 )
 RDEPEND=">=sys-libs/ncurses-5.2
 	gpm? ( >=sys-libs/gpm-1.19.3 )
-	gtk? (
-		!gtk2? ( =x11-libs/gtk+-1.2* )
-		gtk2? ( >=x11-libs/gtk+-2.0.0 )
-	)"
+	gtk? ( !gtk2? ( =x11-libs/gtk+-1.2* )
+	       gtk2? ( >=x11-libs/gtk+-2.0.0 ) )"
+
 DEPEND="${RDEPEND}
 	>=sys-apps/portage-2.0.51
+	sys-apps/findutils
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -31,6 +31,12 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-close-dialogs.patch
 	epatch ${FILESDIR}/${P}-save_load.patch
 	epatch ${FILESDIR}/${P}-nls.patch
+
+	# Prevent auto* from rerunning... bug #70379
+	touch aclocal.m4
+	find . -name Makefile.in -exec touch {} \;
+	find . -name stamp-h.in -exec touch {} \;
+	touch configure
 }
 
 src_compile() {
diff --git a/media-sound/aumix/files/aumix-2.8-nls.patch b/media-sound/aumix/files/aumix-2.8-nls.patch
index 3243d48409f3..7c79d9ebd6b3 100644
--- a/media-sound/aumix/files/aumix-2.8-nls.patch
+++ b/media-sound/aumix/files/aumix-2.8-nls.patch
@@ -1,6 +1,6 @@
 diff -Naur aumix-2.8.orig/configure aumix-2.8/configure
 --- aumix-2.8.orig/configure	2002-11-24 17:35:48.000000000 -0800
-+++ aumix-2.8/configure	2004-10-31 02:11:40.038574588 -0800
++++ aumix-2.8/configure	2002-11-24 17:35:48.000000000 -0800
 @@ -3801,10 +3801,6 @@
  USE_INCLUDED_LIBINTL=no
  
@@ -14,7 +14,7 @@ diff -Naur aumix-2.8.orig/configure aumix-2.8/configure
  # This file is a shell script that caches the results of configure
 diff -Naur aumix-2.8.orig/configure.in aumix-2.8/configure.in
 --- aumix-2.8.orig/configure.in	2002-11-24 17:04:16.000000000 -0800
-+++ aumix-2.8/configure.in	2004-10-31 02:11:09.622964264 -0800
++++ aumix-2.8/configure.in	2002-11-24 17:04:16.000000000 -0800
 @@ -240,9 +240,6 @@
  USE_INCLUDED_LIBINTL=no
  AC_SUBST(USE_INCLUDED_LIBINTL)