header fix; more error checking/messages

3 files changed, 22 insertions, 20 deletions

diff --git a/games-arcade/frozen-bubble/Manifest b/games-arcade/frozen-bubble/Manifest
index 19545efe6c3a..5e6f26094f2d 100644
--- a/games-arcade/frozen-bubble/Manifest
+++ b/games-arcade/frozen-bubble/Manifest
@@ -1,8 +1,6 @@
 MD5 ac24959d19b59fca70f3297a8b79a144 ChangeLog 3699
-MD5 35119a9cad4a5320cb5600ff9ec5b144 frozen-bubble-1.0.0-r1.ebuild 936
-MD5 da7816268628d75162c126096ebf3182 frozen-bubble-1.0.0-r2.ebuild 1543
-MD5 c7aa860ab5a2989dc96a6e564d6dc748 frozen-bubble-1.0.0-r3.ebuild 1870
-MD5 b244cf1c41a78cacb62296d573935c07 metadata.xml 245
+MD5 18c53a751f104dced9e86fe219f2b103 frozen-bubble-1.0.0-r1.ebuild 939
+MD5 4b5fcb44d441492548355e6850783fe4 frozen-bubble-1.0.0-r3.ebuild 1922
+MD5 ed81470e0a1698d713b04ecb69d5a9e0 metadata.xml 449
 MD5 3e508d07074929a0fb48dc970a997ec7 files/digest-frozen-bubble-1.0.0-r1 73
-MD5 9a77f057ee51c039f467c20fa822159d files/digest-frozen-bubble-1.0.0-r2 228
 MD5 9a77f057ee51c039f467c20fa822159d files/digest-frozen-bubble-1.0.0-r3 228
diff --git a/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r1.ebuild b/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r1.ebuild
index 775b4d34bee8..1fb34306967c 100644
--- a/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r1.ebuild
+++ b/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r1.ebuild,v 1.1 2003/09/10 19:29:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r1.ebuild,v 1.2 2004/02/03 01:28:31 mr_bones_ Exp $
 
 inherit perl-module
 
@@ -8,9 +8,10 @@ DESCRIPTION="A Puzzle Bubble clone written in perl"
 HOMEPAGE="http://www.frozen-bubble.org/"
 SRC_URI="http://guillaume.cottenceau.free.fr/fb/${P}.tar.bz2"
 
-SLOT="0"
-LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
 
 DEPEND="virtual/glibc
 	>=sys-apps/sed-4
@@ -35,5 +36,5 @@ src_install() {
 	make PREFIX="${D}/usr" install || die
 
 	dosed /usr/bin/frozen-bubble
-	dodoc AUTHORS CHANGES COPYING README
+	dodoc AUTHORS CHANGES README
 }
diff --git a/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r3.ebuild b/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r3.ebuild
index 1f66fd2805d2..5463d3396186 100644
--- a/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r3.ebuild
+++ b/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r3.ebuild,v 1.3 2004/01/29 09:40:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r3.ebuild,v 1.4 2004/02/03 01:28:31 mr_bones_ Exp $
 
 inherit games perl-module
 
@@ -12,9 +12,10 @@ SRC_URI="http://guillaume.cottenceau.free.fr/fb/${P}.tar.bz2
 	http://chl.tuxfamily.org/frozen-bubble/${NET_CLIENT_P}.tar.bz2
 	http://chl.tuxfamily.org/frozen-bubble/${NET_SERVER_P}.tar.bz2"
 
+KEYWORDS="x86 ppc hppa amd64"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc hppa amd64"
+IUSE=""
 
 DEPEND="virtual/glibc
 	>=sys-apps/sed-4
@@ -25,9 +26,10 @@ DEPEND="virtual/glibc
 src_unpack() {
 	unpack ${A}
 
-	sed -i 's:INSTALLDIRS=.*:PREFIX=${D}/usr:' \
-		${P}/c_stuff/Makefile \
-		|| die 'sed c_stuff/Makefile failed'
+	sed -i \
+		-e 's:INSTALLDIRS=.*:PREFIX=${D}/usr:' \
+			${P}/c_stuff/Makefile \
+				|| die 'sed c_stuff/Makefile failed'
 }
 
 src_compile() {
@@ -37,7 +39,7 @@ src_compile() {
 		BINDIR=${GAMES_BINDIR} \
 		DATADIR=${GAMES_DATADIR} \
 		MANDIR=/usr/share/man \
-		|| die
+			|| die "make failed"
 
 	cd ${WORKDIR}/${NET_SERVER_P}
 	./bootstrap.sh || die
@@ -51,9 +53,9 @@ src_install() {
 		DATADIR=${D}/${GAMES_DATADIR} \
 		MANDIR=${D}/usr/share/man \
 		install \
-		|| die
+			|| die "make install failed"
 	dosed /usr/games/bin/frozen-bubble
-	dodoc AUTHORS CHANGES COPYING README
+	dodoc AUTHORS CHANGES README
 
 	cd ${WORKDIR}/${NET_CLIENT_P}
 	make \
@@ -62,10 +64,11 @@ src_install() {
 		DATADIR=${D}/${GAMES_DATADIR} \
 		MANDIR=${D}/usr/share/man \
 		install \
-		|| die
+			|| die "make install failed"
 
 	cd ${WORKDIR}/${NET_SERVER_P}
-	make DESTDIR=${D} sbindir=${GAMES_BINDIR} install || die
+	make DESTDIR=${D} sbindir=${GAMES_BINDIR} install \
+		|| die "make install failed"
 	dodoc TODO
 	newdoc README README.server