fix sed for CXXFLAGS; fix config location; more error checking/messages

5 files changed, 45 insertions, 34 deletions

diff --git a/games-board/eboard/ChangeLog b/games-board/eboard/ChangeLog
index fb8de5f0b51c..b9800e55a8ba 100644
--- a/games-board/eboard/ChangeLog
+++ b/games-board/eboard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/eboard
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.4 2004/01/02 02:16:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.5 2004/01/03 03:38:55 mr_bones_ Exp $
+
+  02 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> eboard-0.8.0.ebuild,
+  eboard-0.9.0.ebuild, eboard-0.9.5.ebuild:
+  fix sed for CXXFLAGS (bug 36995)
+  fix config location
+  more error checking/messages
 
 *eboard-0.9.5 (01 Jan 2003)
 
diff --git a/games-board/eboard/Manifest b/games-board/eboard/Manifest
index bc681fa8b365..6aefe6a29cbc 100644
--- a/games-board/eboard/Manifest
+++ b/games-board/eboard/Manifest
@@ -1,8 +1,10 @@
-MD5 546d8833cae830880f5a01d828bcaae0 ChangeLog 1790
-MD5 b5bf6a1bb2ea058b429e327b24693d3d eboard-0.8.0.ebuild 1222
+MD5 c7c6f5d18241cfa62672d0ab685e5b9a ChangeLog 2107
+MD5 fc83933b519f8ece01332c8e05b2f462 eboard-0.8.0.ebuild 1225
+MD5 31e157f683b32fa6c290d002f6bda636 eboard-0.9.0.ebuild 1326
+MD5 89b34a87c8b2d41265f975aff8487676 eboard-0.9.5.ebuild 1806
 MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
-MD5 478bb6406915e36b719b1d29c7095861 eboard-0.9.0.ebuild 1323
 MD5 6953acbec0a7bbd9597ced29af533fd1 files/0.8.0-fake-nls.patch 191
-MD5 3c36db72c37ae94198738d7f8abf6eb3 files/digest-eboard-0.8.0 134
 MD5 6953acbec0a7bbd9597ced29af533fd1 files/0.9.0-fake-nls.patch 191
+MD5 3c36db72c37ae94198738d7f8abf6eb3 files/digest-eboard-0.8.0 134
 MD5 9ed370ac58351e2a2649f3c93428da3a files/digest-eboard-0.9.0 201
+MD5 f37e8356d4b5cb9585c1bdae8dcd889c files/digest-eboard-0.9.5 201
diff --git a/games-board/eboard/eboard-0.8.0.ebuild b/games-board/eboard/eboard-0.8.0.ebuild
index adba5d5fc5e1..bb4f09268f92 100644
--- a/games-board/eboard/eboard-0.8.0.ebuild
+++ b/games-board/eboard/eboard-0.8.0.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-board/eboard/eboard-0.8.0.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-0.8.0.ebuild,v 1.2 2004/01/03 03:38:56 mr_bones_ Exp $
 
 inherit games eutils
 
diff --git a/games-board/eboard/eboard-0.9.0.ebuild b/games-board/eboard/eboard-0.9.0.ebuild
index 55e4addf1fa5..61f335d345d9 100644
--- a/games-board/eboard/eboard-0.9.0.ebuild
+++ b/games-board/eboard/eboard-0.9.0.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-board/eboard/eboard-0.9.0.ebuild,v 1.1 2003/10/13 20:46:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-0.9.0.ebuild,v 1.2 2004/01/03 03:38:56 mr_bones_ Exp $
 
 inherit games eutils
 
diff --git a/games-board/eboard/eboard-0.9.5.ebuild b/games-board/eboard/eboard-0.9.5.ebuild
index 9c9ea8cf5418..aa61b2936bc5 100644
--- a/games-board/eboard/eboard-0.9.5.ebuild
+++ b/games-board/eboard/eboard-0.9.5.ebuild
@@ -1,8 +1,8 @@
-# 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-board/eboard/eboard-0.9.5.ebuild,v 1.1 2004/01/02 02:16:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-0.9.5.ebuild,v 1.2 2004/01/03 03:38:56 mr_bones_ Exp $
 
-inherit games eutils
+inherit eutils games
 
 EXTRAS1=eboard-extras-1pl2
 EXTRAS2=eboard-extras-2
@@ -12,9 +12,9 @@ SRC_URI="mirror://sourceforge/eboard/${P}.tar.gz
 	mirror://sourceforge/eboard/${EXTRAS1}.tar.gz
 	mirror://sourceforge/eboard/${EXTRAS2}.tar.gz"
 
+KEYWORDS="x86 ppc"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
 IUSE="nls"
 
 DEPEND="=x11-libs/gtk+-1*
@@ -26,34 +26,37 @@ DEPEND="=x11-libs/gtk+-1*
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i "s:-O6:${CXXFLAGS}:" configure
+	sed -i \
+		-e "/DATADIR/ s:\$prefix/share:${GAMES_DATADIR}:" \
+		-e "s:(\"-O6\"):split(' ', \"${CXXFLAGS}\"):" configure \
+		|| die "sed configure failed"
 }
 
 src_compile() {
 	egamesconf `use_enable nls` || die
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	emake install \
-		prefix=${D}/${GAMES_PREFIX} \
-		bindir=${D}/${GAMES_BINDIR} \
-		mandir=${D}/usr/share/man \
-		datadir=${D}/${GAMES_DATADIR}/${PN} \
-		|| die
-	dodoc README AUTHORS ChangeLog TODO
-	dodoc Documentation/*
-
-	insinto ${GAMES_DATADIR}/eboard
-	cd ${WORKDIR}/${EXTRAS1}
-	doins *.png *.wav
-	newins extras1.conf themeconf.extras1
-	newdoc ChangeLog Changelog.extras
-	newdoc README README.extras
-	dodoc CREDITS
-	cd ${WORKDIR}/${EXTRAS2}
-	doins *.png *.wav
-	newins extras2.conf themeconf.extras2
+	make \
+		prefix="${D}/${GAMES_PREFIX}" \
+		bindir="${D}/${GAMES_BINDIR}" \
+		mandir="${D}/usr/share/man" \
+		datadir="${D}/${GAMES_DATADIR}/${PN}" \
+			install || die "make install failed"
+	dodoc README AUTHORS ChangeLog TODO Documentation/* || die "dodoc failed"
+
+	cd "${WORKDIR}/${EXTRAS1}"
+	insinto "${GAMES_DATADIR}/eboard"
+	doins *.png *.wav || die "doins failed (extra1)"
+	newins extras1.conf themeconf.extras1 || die "newins failed (extra1)"
+	newdoc ChangeLog Changelog.extras || die "newdoc failed (extra1.1)"
+	newdoc README README.extras || die "newdoc failed (extra1.2)"
+	dodoc CREDITS || die "dodoc failed (extra1)"
+
+	cd "${WORKDIR}/${EXTRAS2}"
+	doins *.png *.wav || die "doins failed (extra2)"
+	newins extras2.conf themeconf.extras2 || die "newins failed (extra2)"
 
 	prepgamesdirs
 }