DEPEND on sed >= 4; use sed -i

3 files changed, 20 insertions, 18 deletions

diff --git a/app-emulation/nwwine/ChangeLog b/app-emulation/nwwine/ChangeLog
index f7e314ca3831..5c1899a4a3ba 100644
--- a/app-emulation/nwwine/ChangeLog
+++ b/app-emulation/nwwine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/nwwine
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/nwwine/ChangeLog,v 1.2 2003/04/01 18:10:12 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/nwwine/ChangeLog,v 1.3 2003/06/07 03:31:30 msterret Exp $
+
+  06 Jun 2003; <msterret@gentoo.org> nwwine-20020703.ebuild:
+  DEPEND on sed >= 4; use sed -i
 
 *nwwine-20020703 (28 Mar 2003)
 
diff --git a/app-emulation/nwwine/Manifest b/app-emulation/nwwine/Manifest
index d5f7284c3d0a..4ad307b47686 100644
--- a/app-emulation/nwwine/Manifest
+++ b/app-emulation/nwwine/Manifest
@@ -1,5 +1,5 @@
-MD5 12943ba53e3c19b0e5f70c948493f865 ChangeLog 614
-MD5 c90d79d0179263030d9c60b3b9980395 nwwine-20020703.ebuild 3239
+MD5 b1e616428921e341d8a3d20e696e77f3 ChangeLog 710
+MD5 5b3844d9e7c3add6300a43d8f6a5c64f nwwine-20020703.ebuild 3315
 MD5 cec34c252d6533f2810215a52b8da2ff files/digest-nwwine-20020703 68
 MD5 af8da46a0e51578ff1e18e399141d628 files/nwwine-20020703-fake_windows.tar.bz2 500
 MD5 0244316187b4ee80cb791d238f1a67a6 files/nwwine-20020703-misc.tar.bz2 4603
diff --git a/app-emulation/nwwine/nwwine-20020703.ebuild b/app-emulation/nwwine/nwwine-20020703.ebuild
index 22502558d925..65514daafb50 100644
--- a/app-emulation/nwwine/nwwine-20020703.ebuild
+++ b/app-emulation/nwwine/nwwine-20020703.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/nwwine/nwwine-20020703.ebuild,v 1.2 2003/04/01 18:10:12 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/nwwine/nwwine-20020703.ebuild,v 1.3 2003/06/07 03:31:30 msterret Exp $
 
 DESCRIPTION="A special version of wine for the Never Winter Nights toolkit"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -14,24 +14,25 @@ IUSE="nas arts cups opengl alsa tcltk"
 DEPEND="sys-devel/gcc
 	sys-devel/flex
 	dev-util/yacc
+	>=sys-apps/sed-4
 	>=sys-libs/ncurses-5.2
 	>=media-libs/freetype-2.0.0
 	X? ( 	virtual/x11 )
-	tcltk? ( dev-lang/tcl dev-lang/tk ) 
+	tcltk? ( dev-lang/tcl dev-lang/tk )
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
 	opengl? ( virtual/opengl )"
 
-src_compile() {	
+src_compile() {
 	cd ${S}
 	local myconf
 
 	use opengl && myconf="--enable-opengl" || myconf="--disable-opengl"
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
-	
+
 	# use the default setting in ./configure over the /etc/make.conf setting
 	unset CFLAGS CXXFLAGS
 
@@ -39,31 +40,29 @@ src_compile() {
 		--sysconfdir=/etc/${PN} \
 		--host=${CHOST} \
 		--enable-curses \
-		${myconf} || die
+		${myconf} || die "configure failed"
+
+	sed -i -e 's:wine.pm:include/wine.pm:' ${S}/programs/winetest/Makefile || \
+		die "sed programs/winetest/Makefile failed"
 
-	cd ${S}/programs/winetest
-	cp Makefile 1
-	sed -e 's:wine.pm:include/wine.pm:' 1 > Makefile
-	
 	# No parallel make
-	cd ${S}	
-	make depend all || die
+	make depend all || die "make depend all failed"
 	cd programs && emake || die
 }
 
 src_install () {
 	local WINEMAKEOPTS="prefix=${D}/usr/lib/${PN}"
-	
+
 	### Install wine to ${D}
 	cd ${S}
 	make ${WINEMAKEOPTS} install || die
 	cd ${S}/programs
 	make ${WINEMAKEOPTS} install || die
-	
+
 	# Needed for later installation
 	dodir /usr/bin
- 
-	### Creation of /usr/lib/${PN}/.data 
+
+	### Creation of /usr/lib/${PN}/.data
 	# set up fake_windows
 	dodir /usr/lib/${PN}/.data
 	cd ${D}/usr/lib/nwwine/.data