summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2004-04-19 02:37:02 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2004-04-19 02:37:02 +0000
commit5cdcb3789404da81dbaf337fd7952e093b204559 (patch)
tree008389a78832a85b3169acd68e2298df9a129c29 /x11-base
parentmask gradm2 till I get a chance to remove it from the tree. users of grsec2 s... (diff)
downloadhistorical-5cdcb3789404da81dbaf337fd7952e093b204559.tar.gz
historical-5cdcb3789404da81dbaf337fd7952e093b204559.tar.bz2
historical-5cdcb3789404da81dbaf337fd7952e093b204559.zip
Prevent 9017 from applying for now, some build breakage reported by jhuebel.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog5
-rw-r--r--x11-base/xfree/Manifest4
-rw-r--r--x11-base/xfree/xfree-4.3.0-r5.ebuild8
3 files changed, 11 insertions, 6 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index c57ef9790eea..f00e06fda860 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.321 2004/04/19 02:02:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.322 2004/04/19 02:37:02 spyderous Exp $
+
+ 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.
18 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild:
PATCH_VER 2.1.25.3. Add 9017_amd64_4.3.0-IncludeSharedObjectInNormalLib.patch
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index beeed648764d..ee0047aa3293 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,7 +1,7 @@
MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
-MD5 b77113d09d12144f0180ac98ceafdc10 ChangeLog 71199
+MD5 8c0de2214aa7c45da758b033d8b196ab ChangeLog 71357
MD5 5962beb1551827d1cf73857bbb656bf6 xfree-4.3.0-r6.ebuild 36826
-MD5 d6e6b7d1eddbd8ac7f794824070465fe xfree-4.3.0-r5.ebuild 35485
+MD5 fae686c3ff05f25a511080307ccbb035 xfree-4.3.0-r5.ebuild 35578
MD5 0dae822a5b11c6ac775631b65e7ef192 xfree-4.3.99.902-r2.ebuild 31440
MD5 22283efeb0bda201de6b574fa1ab369e files/digest-xfree-4.3.0-r6 1528
MD5 7fd6e890f5d2a756eb18123975ad7f49 files/digest-xfree-4.3.0-r5 2002
diff --git a/x11-base/xfree/xfree-4.3.0-r5.ebuild b/x11-base/xfree/xfree-4.3.0-r5.ebuild
index 7bb9003e4a65..dd1cd91e5caa 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.8 2004/04/19 02:02:43 spyderous Exp $
+# $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 $
# 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,8 +266,10 @@ src_unpack() {
# patch 9017 overlaps 9015 and 9016 and is applied instead
if [ "${ARCH}" = "amd64" ]
then
- mv -f ${PATCH_DIR}/9015* ${PATCH_DIR}/excluded
- mv -f ${PATCH_DIR}/9016* ${PATCH_DIR}/excluded
+ 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
fi
# This was formerly applied if USE=debug, but it causes builds