Switch to use epause and ebeep, bug #62950

8 files changed, 28 insertions, 50 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index b15ae879f30b..8f128a451da0 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.357 2004/08/02 19:42:06 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.358 2004/09/06 20:56:20 ciaranm Exp $
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> xfree-4.3.0-r7.ebuild:
+  Switch to use epause and ebeep, bug #62950
 
   02 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild,
   xfree-4.3.0-r6.ebuild, xfree-4.3.0-r7.ebuild:
diff --git a/x11-base/xfree/xfree-4.3.0-r7.ebuild b/x11-base/xfree/xfree-4.3.0-r7.ebuild
index 2ab83e0b609d..2f240e42b095 100644
--- a/x11-base/xfree/xfree-4.3.0-r7.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r7.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/x11-base/xfree/xfree-4.3.0-r7.ebuild,v 1.7 2004/08/02 19:42:06 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r7.ebuild,v 1.8 2004/09/06 20:56:20 ciaranm Exp $
 
 # TODO
 # 14 Mar. 2004 <spyderous@gentoo.org>
@@ -1315,13 +1315,8 @@ pkg_postinst() {
 	echo
 
 	# Try to get people to read /usr/share/fonts move
-	for TICKER in 1 2 3 4 5
-	do
-		# Double beep here.
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-	done
-	sleep 10
+	ebeep 5
+	epause 10
 
 	if use 3dfx
 	then
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 56b06b84249d..56251984a118 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.104 2004/09/04 17:25:26 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.105 2004/09/06 20:59:59 ciaranm Exp $
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> xorg-x11-6.7.0-r1.ebuild,
+  xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.7.99.902.ebuild,
+  xorg-x11-6.7.99.903.ebuild, xorg-x11-6.7.99.904.ebuild:
+  Switch to use epause and ebeep, bug #62950
 
   04 Sep 2004; Seemant Kulleen <seemant@gentoo.org>
   xorg-x11-6.7.99.904.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
index 0dab810e3694..235bd1c5e36a 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.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/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.33 2004/08/23 03:46:33 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.34 2004/09/06 20:59:59 ciaranm Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -1313,13 +1313,8 @@ print_info() {
 	einfo "read XF86Config."
 
 	# Try to get people to read /usr/share/fonts move
-	for TICKER in 1 2 3 4 5
-	do
-		# Double beep here.
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-	done
-	sleep 10
+	ebeep 5
+	epause 10
 }
 
 pkg_postinst() {
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
index 70f570536e35..16f990a1c390 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-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/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.14 2004/08/27 04:19:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.15 2004/09/06 20:59:59 ciaranm Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -1192,13 +1192,8 @@ print_info() {
 	einfo "read XF86Config."
 
 	# Try to get people to read /usr/share/fonts move
-	for TICKER in 1 2 3 4 5
-	do
-		# Double beep here.
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-	done
-	sleep 10
+	ebeep 5
+	epause 10
 }
 
 pkg_postinst() {
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.99.902.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.99.902.ebuild
index 663d5c5b52a5..7b56bf4dc397 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.99.902.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.99.902.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/x11-base/xorg-x11/xorg-x11-6.7.99.902.ebuild,v 1.7 2004/08/29 03:53:25 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.99.902.ebuild,v 1.8 2004/09/06 20:59:59 ciaranm Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1262,13 +1262,8 @@ print_info() {
 	einfo "read XF86Config."
 
 	# Try to get people to read /usr/share/fonts move
-	for TICKER in 1 2 3 4 5
-	do
-		# Double beep here.
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-	done
-	sleep 10
+	ebeep 5
+	epause 10
 }
 
 pkg_postinst() {
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild
index 293083c6115f..2bd390382f0f 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.99.903.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/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild,v 1.5 2004/08/31 09:20:01 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild,v 1.6 2004/09/06 20:59:59 ciaranm Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1266,13 +1266,8 @@ print_info() {
 	einfo "read XF86Config."
 
 	# Try to get people to read /usr/share/fonts move
-	for TICKER in 1 2 3 4 5
-	do
-		# Double beep here.
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-	done
-	sleep 10
+	ebeep 5
+	epause 10
 }
 
 pkg_postinst() {
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.99.904.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.99.904.ebuild
index 1e2a75c1bdac..47357f7b75dd 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.99.904.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.99.904.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/x11-base/xorg-x11/xorg-x11-6.7.99.904.ebuild,v 1.5 2004/09/04 17:25:26 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.99.904.ebuild,v 1.6 2004/09/06 20:59:59 ciaranm Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1311,13 +1311,8 @@ print_info() {
 	einfo "read XF86Config."
 
 	# Try to get people to read /usr/share/fonts move
-	for TICKER in 1 2 3 4 5
-	do
-		# Double beep here.
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-	done
-	sleep 10
+	ebeep 5
+	epause 10
 }
 
 pkg_postinst() {