summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-01-30 07:15:47 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-01-30 07:15:47 +0000
commit212d54b8d19fd2e19fb6334bb3f0a5154b0f1538 (patch)
tree388aa4c86045639c87826c1034a891f380af9f18 /x11-base/xorg-x11
parentFixed real being force enabled (instead of USE flag configured..) and RESTRIC... (diff)
downloadgentoo-2-212d54b8d19fd2e19fb6334bb3f0a5154b0f1538.tar.gz
gentoo-2-212d54b8d19fd2e19fb6334bb3f0a5154b0f1538.tar.bz2
gentoo-2-212d54b8d19fd2e19fb6334bb3f0a5154b0f1538.zip
Rename patch() to do_patch() so it doesn't overlap with the patch utility and cause some fun infinite recursion. Thanks much to vapier for helping out with this, because I never would've figured it out.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'x11-base/xorg-x11')
-rw-r--r--x11-base/xorg-x11/ChangeLog8
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild6
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 8d890a0c7136..78bf003125ae 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.305 2005/01/25 21:05:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.306 2005/01/30 07:15:47 spyderous Exp $
+
+ 29 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.8.1.902-r1.ebuild:
+ Rename patch() to do_patch() so it doesn't overlap with the patch utility
+ and cause some fun infinite recursion. Thanks much to vapier for helping out
+ with this, because I never would've figured it out.
25 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
xorg-x11-6.8.1.902-r1.ebuild, xorg-x11-6.8.1.902.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild
index 93b58b7d166b..a0317d053ce3 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild,v 1.7 2005/01/25 21:05:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild,v 1.8 2005/01/30 07:15:47 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -160,7 +160,7 @@ src_unpack() {
patch_setup
- patch
+ do_patch
host_def_setup
@@ -433,7 +433,7 @@ unpack_all() {
rm -f ${WORKDIR}/usr/share/fonts/encodings/urdunaqsh-0.enc
}
-patch() {
+do_patch() {
# Bulk patching - based on patch name
# Will create excluded stuff once it's needed
cd ${WORKDIR}