fix for #9446

diff --git a/app-emulation/zsnes/ChangeLog b/app-emulation/zsnes/ChangeLog
index 2cac52417dff6911d95c7e511e105ce6a852375f..7fcfb9fea72e25b82869c21e7420fed8ee46ee17 100644 (file)
--- a/app-emulation/zsnes/ChangeLog
+++ b/app-emulation/zsnes/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for app-emulation/zsnes
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/zsnes/ChangeLog,v 1.11 2002/08/06 18:28:10 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/zsnes/ChangeLog,v 1.12 2002/11/03 18:26:02 vapier Exp $
 
 *zsnes-1.36 (21 Jul 2002)
 
+  03 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added pkg_setup fix for #9446.
+
   06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
   Added -ppc -sparc -sparc64 BACK to keywords, when bumping please please
   honor these KEYWORDS if they are set and read ChangeLog entries

diff --git a/app-emulation/zsnes/zsnes-1.36.ebuild b/app-emulation/zsnes/zsnes-1.36.ebuild
index 44ce32904434e6e6d3b6e403a83bb6308623cdc9..76c6077754ff38be87c14a98345892657041b860 100644 (file)
--- a/app-emulation/zsnes/zsnes-1.36.ebuild
+++ b/app-emulation/zsnes/zsnes-1.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/zsnes/zsnes-1.36.ebuild,v 1.5 2002/10/17 01:18:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/zsnes/zsnes-1.36.ebuild,v 1.6 2002/11/03 18:26:02 vapier Exp $
 
 # Don't attempt to introduce $CFLAGS usage, docs say result will be slower.
 
@@ -23,14 +23,20 @@ RDEPEND="opengl? ( virtual/opengl )
 DEPEND="${RDEPEND}
        >=dev-lang/nasm-0.98"
        
+pkg_setup() {
+       # xfree should not install these, remove until the fixed
+       # xfree is in main use.
+       rm -f /usr/X11R6/include/{zconf.h,zlib.h}
+}
 
 src_compile() {
        cd ${S}/src
        use opengl || myconf="--without-opengl"
-       ./configure --prefix=/usr --host=${CHOST} $myconf || die
+       econf $myconf
        make || die
 }
-src_install () {
+
+src_install() {
        cd ${S}/src
        into /usr
        dobin zsnes