summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-10-26 14:30:24 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-10-26 14:30:24 +0000
commit14c2ecab79007f2a2a7a291397282fe6b0c9bc35 (patch)
tree3131215058681c21d97a33d4fbd68e016c5bd36e /x11-base
parentadded ppc keyword to 2.1.0 (diff)
downloadhistorical-14c2ecab79007f2a2a7a291397282fe6b0c9bc35.tar.gz
historical-14c2ecab79007f2a2a7a291397282fe6b0c9bc35.tar.bz2
historical-14c2ecab79007f2a2a7a291397282fe6b0c9bc35.zip
do not install zlib headers.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog7
-rw-r--r--x11-base/xfree/xfree-4.2.1.ebuild4
2 files changed, 9 insertions, 2 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index e31a9eef62d9..b77f01dd376a 100644
--- 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 82e5462b75ee..20707afa6487 100644
--- 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