do not install zlib headers.

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index e31a9eef62d9986d2243a9fdd9ae9896ee78ee9d..b77f01dd376a10b5e42db8a05aa663a376b3817f 100644 (file)
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.50 2002/10/25 22:35:24 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.51 2002/10/26 14:30:24 azarah Exp $
+
+  26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild :
+
+  Do not install zlib includes, as it conflicts with those of the real
+  zlib package (bug #9470).
 
   25 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild :
 

diff --git a/x11-base/xfree/xfree-4.2.1.ebuild b/x11-base/xfree/xfree-4.2.1.ebuild
index 82e5462b75eef746f79a01a9c7920c71f78698fa..20707afa64873e88a20990125e838811988cc9e6 100644 (file)
--- a/x11-base/xfree/xfree-4.2.1.ebuild
+++ b/x11-base/xfree/xfree-4.2.1.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/x11-base/xfree/xfree-4.2.1.ebuild,v 1.21 2002/10/25 22:35:24 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1.ebuild,v 1.22 2002/10/26 14:30:24 azarah Exp $
 
 IUSE="sse nls mmx truetype 3dnow 3dfx"
 
@@ -382,6 +382,8 @@ src_install() {
 
        # Remove libz.a, as it causes problems (bug #4777)
        rm -f ${D}/usr/X11R6/lib/libz.a
+       # And do not forget the includes (bug #9470)
+       rm -f ${D}/usr/X11R6/include/{zconf.h,zlib.h}
 
        exeinto /etc/X11
        # new session management script