Switch to use epause and ebeep, bug #62950

9 files changed, 40 insertions, 62 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index c67c537fd878..1c4d3d867f6f 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.85 2004/09/03 05:43:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.86 2004/09/06 18:44:20 ciaranm Exp $
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> sun-jdk-1.3.1.09.ebuild,
+  sun-jdk-1.3.1.10.ebuild, sun-jdk-1.3.1.12.ebuild, sun-jdk-1.4.2.05.ebuild,
+  sun-jdk-1.5.0_beta1-r1.ebuild, sun-jdk-1.5.0_beta2-r1.ebuild,
+  sun-jdk-1.5.0_beta2.ebuild, sun-jdk-1.5.0_rc1.ebuild:
+  Switch to use epause and ebeep, bug #62950
 
   03 Sep 2004; Thomas Matthijs <axxo@gentoo.org> sun-jdk-1.5.0_rc1.ebuild:
   correct sdk download url, closes 62663
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild
index 38ab5d6fac08..7aabb64d9ebf 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild,v 1.12 2004/07/14 13:20:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild,v 1.13 2004/09/06 18:44:20 ciaranm Exp $
 
 IUSE="doc mozilla"
 
-inherit java nsplugins
+inherit java nsplugins eutils
 
 At="j2sdk-1_3_1_09-linux-i586.bin"
 S="${WORKDIR}/jdk1.3.1_09"
@@ -135,9 +135,6 @@ pkg_postinst () {
 	einfo " Or use java-config program to set your preferred VM"
 	einfo "******************************************************"
 
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
+	ebeep 5
+	epause 8
 }
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.10.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.10.ebuild
index c68493191598..4484c5523142 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.10.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.10.ebuild,v 1.7 2004/07/14 20:25:47 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.10.ebuild,v 1.8 2004/09/06 18:44:20 ciaranm Exp $
 
 IUSE="doc mozilla"
 
-inherit java nsplugins
+inherit java nsplugins eutils
 
 MY_PV=${PV%.*}_${PV##*.}
 MY_P=jdk${MY_PV}
@@ -141,9 +141,6 @@ pkg_postinst () {
 	einfo " Or use java-config program to set your preferred VM"
 	einfo "******************************************************"
 
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
+	ebeep 5
+	epause 8
 }
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild
index e65750da9471..8b1eef1dec96 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild,v 1.2 2004/07/15 16:38:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild,v 1.3 2004/09/06 18:44:20 ciaranm Exp $
 
 IUSE="doc mozilla"
 
-inherit java nsplugins
+inherit java nsplugins eutils
 
 MY_PV=${PV%.*}_${PV##*.}
 MY_P=jdk${MY_PV}
@@ -141,9 +141,6 @@ pkg_postinst () {
 	einfo " Or use java-config program to set your preferred VM"
 	einfo "******************************************************"
 
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
+	ebeep 5
+	epause 8
 }
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild
index ed7300cf4b11..23f2b8bd6774 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild,v 1.2 2004/08/06 14:11:49 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild,v 1.3 2004/09/06 18:44:20 ciaranm Exp $
 
 IUSE="doc gnome kde mozilla jce"
 
-inherit java nsplugins
+inherit java nsplugins eutils
 
 MY_PV=${PV%.*}_${PV##*.}
 MY_P=j2sdk${MY_PV}
@@ -214,10 +214,6 @@ pkg_postinst () {
 	einfo " Or use java-config program to set your preferred VM"
 	einfo "******************************************************"
 
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
-
+	ebeep 5
+	epause 8
 }
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0_beta1-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0_beta1-r1.ebuild
index 4638f1c2fa6f..d2fbf235ef14 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0_beta1-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0_beta1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0_beta1-r1.ebuild,v 1.3 2004/06/24 22:44:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0_beta1-r1.ebuild,v 1.4 2004/09/06 18:44:20 ciaranm Exp $
 
 IUSE="doc gnome kde mozilla"
 
-inherit java
+inherit java eutils
 
 amd64file="j2sdk-1_5_0-beta-linux-amd64.bin"
 x86file="j2sdk-1_5_0-beta-linux-i586.bin"
@@ -207,10 +207,7 @@ pkg_postinst () {
 	einfo " Or use java-config program to set your preferred VM"
 	einfo "******************************************************"
 
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
-
+	ebeep 5
+	epause 8
 }
+
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0_beta2-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0_beta2-r1.ebuild
index 78bf1ec2cc34..211351ed898f 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0_beta2-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0_beta2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0_beta2-r1.ebuild,v 1.2 2004/06/24 22:44:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0_beta2-r1.ebuild,v 1.3 2004/09/06 18:44:20 ciaranm Exp $
 
 IUSE="doc gnome kde mozilla jce"
 
-inherit java
+inherit java eutils
 
 amd64file="jdk-1_5_0-beta2-linux-amd64.bin"
 x86file="jdk-1_5_0-beta2-linux-i586.bin"
@@ -245,10 +245,6 @@ pkg_postinst () {
 	einfo " which can cause incompatibility with certain sources."
 	einfo "*********************************************************"
 
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
-
+	ebeep 5
+	epause 8
 }
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0_beta2.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0_beta2.ebuild
index 26346f3ac922..c0d84c9845d6 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0_beta2.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0_beta2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0_beta2.ebuild,v 1.3 2004/06/24 22:44:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0_beta2.ebuild,v 1.4 2004/09/06 18:44:20 ciaranm Exp $
 
 IUSE="doc gnome kde mozilla jce"
 
-inherit java
+inherit java eutils
 
 amd64file="jdk-1_5_0-beta2-linux-amd64.bin"
 x86file="jdk-1_5_0-beta2-linux-i586.bin"
@@ -245,10 +245,6 @@ pkg_postinst () {
 	einfo " which can cause incompatibility with certain sources."
 	einfo "*********************************************************"
 
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
-
+	ebeep 5
+	epause 8
 }
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild
index cad0ba155915..72bc086b376f 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild,v 1.2 2004/09/03 05:43:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild,v 1.3 2004/09/06 18:44:20 ciaranm Exp $
 
 IUSE="doc gnome kde mozilla jce"
 
-inherit java
+inherit java eutils
 
 amd64file="jdk-1_5_0-rc-linux-amd64.bin"
 x86file="jdk-1_5_0-rc-linux-i586.bin"
@@ -249,10 +249,6 @@ pkg_postinst () {
 	einfo " which can cause incompatibility with certain sources."
 	einfo "*********************************************************"
 
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
-
+	ebeep 5
+	epause 8
 }