Switch to use epause and ebeep, bug #62950

6 files changed, 35 insertions, 46 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 3388504e31c7..3eac4fba44be 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.13 2004/08/04 13:22:54 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.14 2004/09/06 18:12:45 ciaranm Exp $
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  ibm-jdk-bin-1.4.1-r1.ebuild, ibm-jdk-bin-1.4.1-r2.ebuild,
+  ibm-jdk-bin-1.4.1.ebuild, ibm-jdk-bin-1.4.2.ebuild:
+  Switch to use epause and ebeep, bug #62950
 
   04 Aug 2004; Thomas Matthijs <axxo@gentoo.org> ibm-jdk-bin-1.4.1-r1.ebuild,
   ibm-jdk-bin-1.4.1-r2.ebuild, ibm-jdk-bin-1.4.1.ebuild,
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 167860de08e4..9b455ba3b60c 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 87da0b5bc8c305bc31eef69c1cbb06e0 ibm-jdk-bin-1.4.2.ebuild 2780
-MD5 04606abb7d5c3399b400b1ebd5e3d133 ibm-jdk-bin-1.4.1-r2.ebuild 2792
-MD5 c85cdcca2aeb717a7cb782bfa4fb2548 ibm-jdk-bin-1.4.1.ebuild 3022
-MD5 23a75d8daac1c99745862303e58c9d93 ChangeLog 1869
+MD5 16da0136d4ed4d6e27b0ab15383e7b27 ibm-jdk-bin-1.4.1-r2.ebuild 2573
+MD5 017c092ca4576ed87542d11303ab2745 ibm-jdk-bin-1.4.1.ebuild 2803
+MD5 f01d8c079d2fc0f799d70670a707713f ChangeLog 2084
+MD5 6750b74de9b28dbac026ec3ceb330088 ibm-jdk-bin-1.4.2.ebuild 2562
 MD5 4a3cb4232103a0de9bd143a145086a7b metadata.xml 219
-MD5 56ac4eb16ae764a66fa162c2c04cc68e ibm-jdk-bin-1.4.1-r1.ebuild 3024
-MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
-MD5 0373b1cdf596fac6b3a784ddcb95e6f1 files/digest-ibm-jdk-bin-1.4.1-r1 207
-MD5 b218ad416aab8e8299f77cb1f749e4aa files/digest-ibm-jdk-bin-1.4.1-r2 355
+MD5 e6b49df8428a07bdbf6c0b301df48a07 ibm-jdk-bin-1.4.1-r1.ebuild 2805
 MD5 2a5694754d47014cb37eae87a4758efb files/ibm-jdk-bin-1.4.1 451
+MD5 0373b1cdf596fac6b3a784ddcb95e6f1 files/digest-ibm-jdk-bin-1.4.1-r1 207
+MD5 33b6318d9400227145b67a071909f11f files/digest-ibm-jdk-bin-1.4.2 280
 MD5 0e4ac0d7b8286f469f95e8083da42c17 files/ibm-jdk-bin-1.4.2 451
+MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
 MD5 0373b1cdf596fac6b3a784ddcb95e6f1 files/digest-ibm-jdk-bin-1.4.1 207
-MD5 33b6318d9400227145b67a071909f11f files/digest-ibm-jdk-bin-1.4.2 280
+MD5 b218ad416aab8e8299f77cb1f749e4aa files/digest-ibm-jdk-bin-1.4.1-r2 355
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
+Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBEOOj/rLF9B432nYRAoBAAJ4hK7NVat2kudNQu7RiRCOHu1ZSygCgxyuS
-74k97/sIl3o2NKi9NJwxapc=
-=UDHa
+iD8DBQFBPKf2LLFUmVNQ7rkRAlLcAJ4lnMVSBcvs4iK30PSzhBAQ33nohwCeNAeg
+GvP4at76ouq7OvIaILvVTRI=
+=yMNg
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r1.ebuild
index edc7d52d229c..29b68a02c7e8 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-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/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r1.ebuild,v 1.7 2004/08/04 13:22:54 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r1.ebuild,v 1.8 2004/09/06 18:12:45 ciaranm Exp $
 
 IUSE="X doc javacomm"
 
-inherit java nsplugins
+inherit java nsplugins eutils
 
 if use ppc; then
 	S="${WORKDIR}/IBMJava2-ppc-141"
@@ -78,7 +78,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
 	einfo " After installing ${P} this"
 	einfo " was set as the default JVM to run."
 	einfo " When finished please run the following so your"
@@ -87,9 +86,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/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild
index d64d9b7ad15d..a523cfd31ba9 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.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/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild,v 1.7 2004/08/04 13:22:54 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild,v 1.8 2004/09/06 18:12:45 ciaranm Exp $
 
 IUSE="X doc javacomm"
 
-inherit java nsplugins
+inherit java nsplugins eutils
 
 if use ppc; then
 	S="${WORKDIR}/IBMJava2-ppc-141"
@@ -76,7 +76,6 @@ pkg_postinst() {
 		echo
 	fi
 
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
 	einfo " After installing ${P} this"
 	einfo " was set as the default JVM to run."
 	einfo " When finished please run the following so your"
@@ -85,9 +84,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/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild
index a9ada28bb4dc..baaf16c704d9 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.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/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild,v 1.11 2004/08/04 13:22:54 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild,v 1.12 2004/09/06 18:12:45 ciaranm Exp $
 
 IUSE="X doc javacomm"
 
-inherit java nsplugins
+inherit java nsplugins eutils
 
 if use ppc; then
 	S="${WORKDIR}/IBMJava2-ppc-141"
@@ -78,7 +78,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
 	einfo " After installing ${P} this"
 	einfo " was set as the default JVM to run."
 	einfo " When finished please run the following so your"
@@ -87,9 +86,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/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild
index 6105cba0cf22..8671044c1080 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.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/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.9 2004/08/04 13:22:54 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.10 2004/09/06 18:12:45 ciaranm Exp $
 
 IUSE="X doc javacomm"
 
-inherit java nsplugins
+inherit java nsplugins eutils
 
 if use ppc; then
 	S="${WORKDIR}/IBMJava2-ppc-142"
@@ -76,7 +76,6 @@ pkg_postinst() {
 		echo
 	fi
 
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
 	einfo " After installing ${P} this"
 	einfo " was set as the default JVM to run."
 	einfo " When finished please run the following so your"
@@ -85,9 +84,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
 }