Removed interactive hang if compile fails

9 files changed, 61 insertions, 72 deletions

diff --git a/rox-base/rox-clib/ChangeLog b/rox-base/rox-clib/ChangeLog
index 931a274d362f..11be6a8e4cd5 100644
--- a/rox-base/rox-clib/ChangeLog
+++ b/rox-base/rox-clib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-base/rox-clib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/ChangeLog,v 1.9 2006/11/01 17:20:44 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/ChangeLog,v 1.10 2006/11/14 20:55:54 lack Exp $
+
+  14 Nov 2006; Jim Ramsay <lack@gentoo.org> -rox-clib-2.1.1.ebuild,
+  rox-clib-2.1.5.ebuild, rox-clib-2.1.7.ebuild, rox-clib-2.1.8.ebuild:
+  Removed interactive hang if compile fails
 
   01 Nov 2006; Jim Ramsay <lack@gentoo.org> metadata.xml:
   Now owned by new rox herd
diff --git a/rox-base/rox-clib/Manifest b/rox-base/rox-clib/Manifest
index 55dca31bf8d0..0fa5f5fc503d 100644
--- a/rox-base/rox-clib/Manifest
+++ b/rox-base/rox-clib/Manifest
@@ -1,23 +1,18 @@
-DIST ROX-CLib-2.1.1.tar.gz 235520
-DIST ROX-CLib-2.1.5.tar.gz 248753
-DIST ROX-CLib-2.1.7.tar.gz 423242
+DIST ROX-CLib-2.1.5.tar.gz 248753 RMD160 47c27c53f54e63aaa4f02dbb7c95c55dffa76034 SHA1 14ff3a8d018dbd7975c0cb75fe3d4ba5d52085ea SHA256 c726bbb63e3e583dca35d1d4b476060e06ed509199eda292e51336ec37d7f501
+DIST ROX-CLib-2.1.7.tar.gz 423242 RMD160 a9baafc76a2ed10866df26a15c0b6675891a5033 SHA1 ce16682d37ea1f3803498176486de40c6580b2ce SHA256 306ea4168ccea5a007fd6abf69ef10c15294030ab1083b2afd22e6d828d7fd0a
 DIST ROX-CLib-2.1.8.tar.gz 437209 RMD160 3c838880173dfa27dc81202e964785b7b7cc8684 SHA1 683ec3b9ed2fe8d17dfeb46a308ba75b84dc7bdb SHA256 f2c35a33696ee233e8ed4e933d5291849a1f9c98b0cb9fc7f7fc092450690728
-EBUILD rox-clib-2.1.1.ebuild 711 RMD160 976c89e2dc7d7118bf08c800c78fc380f1e3b7f6 SHA1 71362278a59c1cd0baf920db64f4f582b1bca95c SHA256 963844607a3b9b6a4929c583584bf9b221eb3eaaad5b9c184b81f18aff48be09
-MD5 e156c0e30e3a58fd4a698f043eb23471 rox-clib-2.1.1.ebuild 711
-RMD160 976c89e2dc7d7118bf08c800c78fc380f1e3b7f6 rox-clib-2.1.1.ebuild 711
-SHA256 963844607a3b9b6a4929c583584bf9b221eb3eaaad5b9c184b81f18aff48be09 rox-clib-2.1.1.ebuild 711
-EBUILD rox-clib-2.1.5.ebuild 735 RMD160 aea320b6e52a16bc2d74ab2367fbae4a3754c989 SHA1 d0c1a3432a2f2a5198f5d3c8c484313e3937facc SHA256 7e56aa0fa7029ec7e6dd291e16aabc640ef4067fc5147df207fa1ef086b3fc59
-MD5 b039ea5986a9be5039ea74216cb7ded9 rox-clib-2.1.5.ebuild 735
-RMD160 aea320b6e52a16bc2d74ab2367fbae4a3754c989 rox-clib-2.1.5.ebuild 735
-SHA256 7e56aa0fa7029ec7e6dd291e16aabc640ef4067fc5147df207fa1ef086b3fc59 rox-clib-2.1.5.ebuild 735
-EBUILD rox-clib-2.1.7.ebuild 1341 RMD160 8c5cf94195981bfe58a44b941fd64f9e3aa71f2e SHA1 d4506d6c870032e635c4f189962309eb828cd7dd SHA256 05640703a848796eeaf3f98aab045736d8371b9482f2f8c6041a489ba39db948
-MD5 214eead755bd318aeb9c4ba82e471a78 rox-clib-2.1.7.ebuild 1341
-RMD160 8c5cf94195981bfe58a44b941fd64f9e3aa71f2e rox-clib-2.1.7.ebuild 1341
-SHA256 05640703a848796eeaf3f98aab045736d8371b9482f2f8c6041a489ba39db948 rox-clib-2.1.7.ebuild 1341
-EBUILD rox-clib-2.1.8.ebuild 1536 RMD160 77f0f06508deba88e5fb330d496214f488b4e6cb SHA1 1d766d91fc6a0d49b20375a9d60006524f551aad SHA256 ed3c16449b640a59c4d8c2ba6391f4d47cb5d2cee6d0f93eec93e98ba094965c
-MD5 bf46e8892582df7ab8916bc73b4e4649 rox-clib-2.1.8.ebuild 1536
-RMD160 77f0f06508deba88e5fb330d496214f488b4e6cb rox-clib-2.1.8.ebuild 1536
-SHA256 ed3c16449b640a59c4d8c2ba6391f4d47cb5d2cee6d0f93eec93e98ba094965c rox-clib-2.1.8.ebuild 1536
+EBUILD rox-clib-2.1.5.ebuild 1003 RMD160 662c75d2c64f79493ce6d6567a1b430b76025829 SHA1 44e54e82039460417dc8dc38add54659aa781322 SHA256 221d0cb34a0ba823892b0560cf92d0f2070dcced8e943a003a8c08fe0542c5b8
+MD5 4fc3926293c4f18d8b463dcb70d1281f rox-clib-2.1.5.ebuild 1003
+RMD160 662c75d2c64f79493ce6d6567a1b430b76025829 rox-clib-2.1.5.ebuild 1003
+SHA256 221d0cb34a0ba823892b0560cf92d0f2070dcced8e943a003a8c08fe0542c5b8 rox-clib-2.1.5.ebuild 1003
+EBUILD rox-clib-2.1.7.ebuild 1576 RMD160 8ab1ac01a3938b700377e4a120bec64104b7b421 SHA1 e8fc21df44174116f745dee3c84ab3e9485d3f8e SHA256 9f77eb4bf5c9137a27600c1f9ff525fa27f0ff741fa406b165b5ea31a3fe206c
+MD5 479fd8482ffbdf0381649bfdfae5a894 rox-clib-2.1.7.ebuild 1576
+RMD160 8ab1ac01a3938b700377e4a120bec64104b7b421 rox-clib-2.1.7.ebuild 1576
+SHA256 9f77eb4bf5c9137a27600c1f9ff525fa27f0ff741fa406b165b5ea31a3fe206c rox-clib-2.1.7.ebuild 1576
+EBUILD rox-clib-2.1.8.ebuild 1771 RMD160 bed4181c1b3459082d1e4cf2b23922d0ecf78b5b SHA1 4e12798f9bbbfa5f3daf43ca84c9717a2f6fef7a SHA256 a6243747df1af5fbb3cdad2660f11e30f613ce09a6ef4595100dc740eab181ee
+MD5 0e3edd62aa95434741066a6ddc89c297 rox-clib-2.1.8.ebuild 1771
+RMD160 bed4181c1b3459082d1e4cf2b23922d0ecf78b5b rox-clib-2.1.8.ebuild 1771
+SHA256 a6243747df1af5fbb3cdad2660f11e30f613ce09a6ef4595100dc740eab181ee rox-clib-2.1.8.ebuild 1771
 MISC ChangeLog 1444 RMD160 93f80800ee9a94bc57784dfa9193c7a1360375de SHA1 92bf4f11a9043b2311d310a5433a98dae4309756 SHA256 458ad48293634d43592241846b7b35a3362dd4ae40856d381b8b9d72473161ee
 MD5 90d64140e0288ebbb799340c36852b52 ChangeLog 1444
 RMD160 93f80800ee9a94bc57784dfa9193c7a1360375de ChangeLog 1444
@@ -26,15 +21,12 @@ MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c metadata.xml 157
-MD5 8d9ae64d1a331e02ab7dc49d5b2e35c8 files/digest-rox-clib-2.1.1 66
-RMD160 81503fe9cc84565064ed9aec91b6d5db51d30dd9 files/digest-rox-clib-2.1.1 66
-SHA256 4ee05b72f59ff98b625d578a2fa3ceddb3833a1539de15c281eab25a7f928a2e files/digest-rox-clib-2.1.1 66
-MD5 b2d334d203c0b6e0d328d0482ccac0b4 files/digest-rox-clib-2.1.5 66
-RMD160 c99d149225f6bf3fa2040305700716840a05d00e files/digest-rox-clib-2.1.5 66
-SHA256 26f6ccf644827e76be70a87c4baed26185d9e3d955182e041f4ae23ae12d8ceb files/digest-rox-clib-2.1.5 66
-MD5 61fdf9e998806a7dd321b29e93a805d4 files/digest-rox-clib-2.1.7 66
-RMD160 efc6b270cc5578aed1304d0b84a29d106712f621 files/digest-rox-clib-2.1.7 66
-SHA256 f3f92883e1ee4b6046c5d333c24f9c97aea2137e23328bb6e5739ea245352649 files/digest-rox-clib-2.1.7 66
+MD5 ec1264f0a6214aef76928ae51256ff43 files/digest-rox-clib-2.1.5 244
+RMD160 ed6d3ba7a4432763e14d42a62ebcb8d7159004f2 files/digest-rox-clib-2.1.5 244
+SHA256 530579ea9003c00316609f34f075e963a326bc94f9d1c7cb8a6b6d8770a97bc4 files/digest-rox-clib-2.1.5 244
+MD5 e24b2d08f90e5eb3746b836b33a3964a files/digest-rox-clib-2.1.7 244
+RMD160 41f720242f58c5224ca52435c073fcbd4c86398b files/digest-rox-clib-2.1.7 244
+SHA256 33baa4c0e81cd0fa92aba6a6a6ea1e20ce5770d4224652161c8e5dc1c587bf4e files/digest-rox-clib-2.1.7 244
 MD5 dc345ec1a0c78c5f095f88da5338ffbb files/digest-rox-clib-2.1.8 244
 RMD160 1f3cfb3c87a05485cf09fc7b781abb4d7e08df60 files/digest-rox-clib-2.1.8 244
 SHA256 783bb8dd2d33d3f9ec62adf86bd0a986194f67ca2b9baffe201c4761f6c57e9e files/digest-rox-clib-2.1.8 244
diff --git a/rox-base/rox-clib/files/digest-rox-clib-2.1.1 b/rox-base/rox-clib/files/digest-rox-clib-2.1.1
deleted file mode 100644
index cbb1ac318896..000000000000
--- a/rox-base/rox-clib/files/digest-rox-clib-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c81a81b2fbd4f1da2534f466f8be419 ROX-CLib-2.1.1.tar.gz 235520
diff --git a/rox-base/rox-clib/files/digest-rox-clib-2.1.5 b/rox-base/rox-clib/files/digest-rox-clib-2.1.5
index b137bbf14928..e7d5951514a1 100644
--- a/rox-base/rox-clib/files/digest-rox-clib-2.1.5
+++ b/rox-base/rox-clib/files/digest-rox-clib-2.1.5
@@ -1 +1,3 @@
 MD5 99a3aff882132cc859bd05aa6f154c04 ROX-CLib-2.1.5.tar.gz 248753
+RMD160 47c27c53f54e63aaa4f02dbb7c95c55dffa76034 ROX-CLib-2.1.5.tar.gz 248753
+SHA256 c726bbb63e3e583dca35d1d4b476060e06ed509199eda292e51336ec37d7f501 ROX-CLib-2.1.5.tar.gz 248753
diff --git a/rox-base/rox-clib/files/digest-rox-clib-2.1.7 b/rox-base/rox-clib/files/digest-rox-clib-2.1.7
index 41fc51dc13bd..e23686f3ae06 100644
--- a/rox-base/rox-clib/files/digest-rox-clib-2.1.7
+++ b/rox-base/rox-clib/files/digest-rox-clib-2.1.7
@@ -1 +1,3 @@
 MD5 ddf39e3101d008d8a15fb6d76af212bb ROX-CLib-2.1.7.tar.gz 423242
+RMD160 a9baafc76a2ed10866df26a15c0b6675891a5033 ROX-CLib-2.1.7.tar.gz 423242
+SHA256 306ea4168ccea5a007fd6abf69ef10c15294030ab1083b2afd22e6d828d7fd0a ROX-CLib-2.1.7.tar.gz 423242
diff --git a/rox-base/rox-clib/rox-clib-2.1.1.ebuild b/rox-base/rox-clib/rox-clib-2.1.1.ebuild
deleted file mode 100644
index c5e9f7d87813..000000000000
--- a/rox-base/rox-clib/rox-clib-2.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/rox-clib-2.1.1.ebuild,v 1.2 2005/03/06 00:08:29 josejx Exp $
-
-DESCRIPTION="A library for ROX applications written in C."
-
-HOMEPAGE="http://rox.sourceforge.net/"
-
-MY_PN="ROX-CLib"
-
-SRC_URI="http://www.kerofin.demon.co.uk/rox/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc"
-
-IUSE=""
-
-RDEPEND=">=rox-base/rox-2.1.0"
-
-DEPEND=$RDEPEND
-
-S=${WORKDIR}/ROX-CLib
-
-src_compile() {
-	./AppRun --compile || die
-}
-
-src_install() {
-	rm -rf src || die
-	dodir /usr/lib/ROX-CLib
-	cp -rf * ${D}/usr/lib/ROX-CLib
-	cp -rf .* ${D}/usr/lib/ROX-CLib
-}
diff --git a/rox-base/rox-clib/rox-clib-2.1.5.ebuild b/rox-base/rox-clib/rox-clib-2.1.5.ebuild
index c5843a1e41e9..b80a091f35d7 100644
--- a/rox-base/rox-clib/rox-clib-2.1.5.ebuild
+++ b/rox-base/rox-clib/rox-clib-2.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/rox-clib-2.1.5.ebuild,v 1.1 2005/10/03 10:30:52 svyatogor Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/rox-clib-2.1.5.ebuild,v 1.2 2006/11/14 20:55:54 lack Exp $
 
 DESCRIPTION="A library for ROX applications written in C."
 
@@ -25,7 +25,15 @@ DEPEND=$RDEPEND
 S=${WORKDIR}/ROX-CLib
 
 src_compile() {
-	./AppRun --compile || die
+	# Most rox self-compiles have a 'read' call to wait for the user to
+	# press return if the compile fails.
+	# Find and remove this:
+	sed -i.bak -e 's/\<read WAIT\>/#read/' AppRun
+
+	./AppRun --compile || die "Could not make ROX-CLib. Sorry."
+
+	# Restore the original AppRun
+	mv AppRun.bak AppRun
 }
 
 src_install() {
diff --git a/rox-base/rox-clib/rox-clib-2.1.7.ebuild b/rox-base/rox-clib/rox-clib-2.1.7.ebuild
index 14a5eb67d75c..5f7ca37dd16d 100644
--- a/rox-base/rox-clib/rox-clib-2.1.7.ebuild
+++ b/rox-base/rox-clib/rox-clib-2.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/rox-clib-2.1.7.ebuild,v 1.3 2005/12/09 21:31:05 svyatogor Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/rox-clib-2.1.7.ebuild,v 1.4 2006/11/14 20:55:54 lack Exp $
 
 MY_PN="ROX-CLib"
 DESCRIPTION="A library for ROX applications written in C."
@@ -19,7 +19,16 @@ APPNAME=${MY_PN}
 
 src_compile() {
 	chmod 0755 AppRun
+
+	# Most rox self-compiles have a 'read' call to wait for the user to
+	# press return if the compile fails.
+	# Find and remove this:
+	sed -i.bak -e 's/\<read WAIT\>/#read/' AppRun
+
 	./AppRun --compile || die "Could not make ROX-CLib. Sorry."
+
+	# Restore the original AppRun
+	mv AppRun.bak AppRun
 }
 
 src_install() {
diff --git a/rox-base/rox-clib/rox-clib-2.1.8.ebuild b/rox-base/rox-clib/rox-clib-2.1.8.ebuild
index 10697ba54779..31ee04285f93 100644
--- a/rox-base/rox-clib/rox-clib-2.1.8.ebuild
+++ b/rox-base/rox-clib/rox-clib-2.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/rox-clib-2.1.8.ebuild,v 1.2 2006/10/05 17:29:49 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/rox-clib-2.1.8.ebuild,v 1.3 2006/11/14 20:55:54 lack Exp $
 
 MY_PN="ROX-CLib"
 DESCRIPTION="A library for ROX applications written in C."
@@ -20,7 +20,16 @@ APPNAME=${MY_PN}
 
 src_compile() {
 	chmod 0755 AppRun
+
+	# Most rox self-compiles have a 'read' call to wait for the user to
+	# press return if the compile fails.
+	# Find and remove this:
+	sed -i.bak -e 's/\<read WAIT\>/#read/' AppRun
+
 	./AppRun --compile || die "Could not make ROX-CLib. Sorry."
+
+	# Restore the original AppRun
+	mv AppRun.bak AppRun
 }
 src_install() {
 	#  clean up source instead of remove it!