From a9d27d4d1abb33db0308a6141eda59755ca579be Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Mon, 12 Apr 2004 07:07:06 +0000 Subject: PATCH_VER 0.4. Add 9300_all_4.3.0-ncurses-xf86cfg-bool-conflict.patch to avoid conflict of bool between ncurses-5.4 and xf86cfg (#43491). --- x11-base/xorg-x11/ChangeLog | 6 +++++- x11-base/xorg-x11/files/digest-xorg-x11-6.7.0 | 2 +- x11-base/xorg-x11/xorg-x11-6.7.0.ebuild | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'x11-base') diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index bfd2d001e0fd..cc09cff4f583 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.22 2004/04/12 02:00:19 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.23 2004/04/12 07:07:06 spyderous Exp $ + + 12 Apr 2004; Donnie Berkholz ; xorg-x11-6.7.0.ebuild: + PATCH_VER 0.4. Add 9300_all_4.3.0-ncurses-xf86cfg-bool-conflict.patch to avoid + conflict of bool between ncurses-5.4 and xf86cfg (#43491). 11 Apr 2004; Donnie Berkholz ; xorg-x11-6.7.0.ebuild: Add some arch-specific CFLAGS mangling. diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0 b/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0 index 6e1122d54371..00cc820c1753 100644 --- a/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0 +++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0 @@ -3,7 +3,7 @@ MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892 MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173 MD5 2d091e7ca01bddd12a99f4d37b3b0234 xorg-x11-6.7.0-files-0.2.tar.bz2 9169 -MD5 b0635314133635deb0242d453a16de1e xorg-x11-6.7.0-patches-0.3.tar.bz2 79724 +MD5 021de592957dbd1f6e9ca2e4b6bff556 xorg-x11-6.7.0-patches-0.4.tar.bz2 79909 MD5 22465263bae7a2e9f5ad77e172cf1ab5 X11R6.7.0-src1.tar.gz 30039655 MD5 6ef4e8f7647a28f080c10ea1bcf01f79 X11R6.7.0-src2.tar.gz 5739983 MD5 4c7144786522bbce383b21ace72bf669 X11R6.7.0-src3.tar.gz 10855793 diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild index fee421cd5b54..11628c4fe767 100644 --- a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.22 2004/04/12 04:36:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.23 2004/04/12 07:07:06 spyderous Exp $ # This is a snapshot of the XORG-RELEASE-1 branch. @@ -66,7 +66,7 @@ IUSE="3dfx cjk debug doc hardened ipv6 nls pam sdk static pie" # IUSE_INPUT_DEVICES="synaptics wacom" FILES_VER="0.2" -PATCH_VER="0.3" +PATCH_VER="0.4" #RENDER_VER="0.8" #XRENDER_VER="0.8.4" #XFT_VER="2.1.5" -- cgit v1.2.3-65-gdbad