diff options
author | Donnie Berkholz <spyderous@gentoo.org> | 2004-04-19 03:05:56 +0000 |
---|---|---|
committer | Donnie Berkholz <spyderous@gentoo.org> | 2004-04-19 03:05:56 +0000 |
commit | 97f118ab3d8838b5065bbe301fe35f96a0fca0c6 (patch) | |
tree | 068f07030b05d034af3e6041a02539a555b52142 /x11-base | |
parent | Prevent 9017 from applying for now, some build breakage reported by jhuebel. ... (diff) | |
download | gentoo-2-97f118ab3d8838b5065bbe301fe35f96a0fca0c6.tar.gz gentoo-2-97f118ab3d8838b5065bbe301fe35f96a0fca0c6.tar.bz2 gentoo-2-97f118ab3d8838b5065bbe301fe35f96a0fca0c6.zip |
Revert last fix, it was some one-off error.
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/xfree/ChangeLog | 5 | ||||
-rw-r--r-- | x11-base/xfree/xfree-4.3.0-r5.ebuild | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index f00e06fda860..7622e350c349 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-base/xfree # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.322 2004/04/19 02:37:02 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.323 2004/04/19 03:05:56 spyderous Exp $ + + 18 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild: + Revert last fix, it was some one-off error. 18 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild: Prevent 9017 from applying for now, some build breakage reported by jhuebel. diff --git a/x11-base/xfree/xfree-4.3.0-r5.ebuild b/x11-base/xfree/xfree-4.3.0-r5.ebuild index dd1cd91e5caa..dc749912961d 100644 --- a/x11-base/xfree/xfree-4.3.0-r5.ebuild +++ b/x11-base/xfree/xfree-4.3.0-r5.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/xfree/xfree-4.3.0-r5.ebuild,v 1.9 2004/04/19 02:37:02 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.10 2004/04/19 03:05:56 spyderous Exp $ # Make sure Portage does _NOT_ strip symbols. We will do it later and make sure # that only we only strip stuff that are safe to strip ... @@ -266,10 +266,8 @@ src_unpack() { # patch 9017 overlaps 9015 and 9016 and is applied instead if [ "${ARCH}" = "amd64" ] then - mv -f ${PATCH_DIR}/9017* ${PATCH_DIR}/excluded -# Breaks -- commented out, pending a fix -# mv -f ${PATCH_DIR}/9015* ${PATCH_DIR}/excluded -# mv -f ${PATCH_DIR}/9016* ${PATCH_DIR}/excluded + mv -f ${PATCH_DIR}/9015* ${PATCH_DIR}/excluded + mv -f ${PATCH_DIR}/9016* ${PATCH_DIR}/excluded fi # This was formerly applied if USE=debug, but it causes builds |