summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-02-21 21:33:28 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-02-21 21:33:28 +0000
commitbac16645e36533495314e2177b2361b51f800ed9 (patch)
treeb1bc856009d4717e4c6501f2d2aae455ad442ccd /x11-base/xfree-drm
parentversion bump (Manifest recommit) (diff)
downloadgentoo-2-bac16645e36533495314e2177b2361b51f800ed9.tar.gz
gentoo-2-bac16645e36533495314e2177b2361b51f800ed9.tar.bz2
gentoo-2-bac16645e36533495314e2177b2361b51f800ed9.zip
Cleanup, mostly comments and quotes.
Diffstat (limited to 'x11-base/xfree-drm')
-rw-r--r--x11-base/xfree-drm/ChangeLog6
-rw-r--r--x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild22
2 files changed, 16 insertions, 12 deletions
diff --git a/x11-base/xfree-drm/ChangeLog b/x11-base/xfree-drm/ChangeLog
index 28adef721a2e..4caebb37b0a9 100644
--- a/x11-base/xfree-drm/ChangeLog
+++ b/x11-base/xfree-drm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xfree-drm
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.55 2004/02/15 09:47:50 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.56 2004/02/21 21:33:28 spyderous Exp $
+
+ 21 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ xfree-drm-4.3.0-r7.ebuild:
+ Cleanup, mostly comments and quotes.
15 Feb 2004; David Holm <dholm@gentoo.org> xfree-drm-4.3.0-r7.ebuild:
Fixed broken ioremap patch and added to ~ppc.
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild
index e0f17cf0bc1e..edc114db7ad7 100644
--- a/x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild
+++ b/x11-base/xfree-drm/xfree-drm-4.3.0-r7.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-drm/xfree-drm-4.3.0-r7.ebuild,v 1.9 2004/02/15 09:47:50 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild,v 1.10 2004/02/21 21:33:28 spyderous Exp $
IUSE="gatos"
IUSE_VIDEO_CARDS="3dfx gamma i810 i830 matrox rage128 radeon sis mach64"
@@ -66,7 +66,7 @@ pkg_setup() {
fi
# 2.6 kernels are broken for now
- is_kernel "2" "6" && \
+ is_kernel 2 6 && \
die "Please link /usr/src/linux to 2.4 kernel sources. xfree-drm does not yet work with 2.6 kernels, use the DRM in the kernel."
# Force at least make dep (this checks for bzImage, actually) (bug #22853)
@@ -85,16 +85,15 @@ src_unpack() {
if use gatos
then
unpack linux-drm-gatos-${PV}-kernelsource-${SNAPSHOT}.tar.bz2
- unpack ${PF}-gentoo-${PATCHVER}.tar.bz2
elif use video_cards_mach64
then
unpack linux-drm-mach64-${PV}-kernelsource-${SNAPSHOT}.tar.bz2
- unpack ${PF}-gentoo-${PATCHVER}.tar.bz2
else # standard case
unpack linux-drm-${PV}-kernelsource-${SNAPSHOT}.tar.bz2
- unpack ${PF}-gentoo-${PATCHVER}.tar.bz2
fi
+ unpack ${PF}-gentoo-${PATCHVER}.tar.bz2
+
cd ${S}
# Move AGP checker and alanh's Makefile over
@@ -211,10 +210,12 @@ set_vidcards() {
patch_prepare() {
# Do patch excluding based on standard, mach64 or gatos here.
- # Works everywhere:
- # 002_all_dristat-compile-fix.patch
+ # 001-099: Patches used in multiple sources
+ # 100-199: Standard-only patches
+ # 200-299: Mach64 patches
+ # 300-399: Gatos patches
- # if [ ! "`is_kernel 2 6" ]
+ # if [ ! "`is_kernel 2 6`" ]
# then
# mv -f ${PATCHDIR}/*2.6* ${EXCLUDED}
# fi
@@ -222,13 +223,12 @@ patch_prepare() {
if use video_cards_mach64
then
einfo "Updating for mach64 build..."
- # Also exclude all non-mach64 patches
- # mv -f ${PATCHDIR}/3* ${EXCLUDED}
+ # Exclude all non-mach64 patches
mv -f ${PATCHDIR}/004* ${EXCLUDED}
+ mv -f ${PATCHDIR}/3* ${EXCLUDED}
elif use gatos
then
einfo "Updating for gatos build..."
- # This Makefile.linux might be more work to port to alanh's version
# Exclude all non-gatos patches
mv -f ${PATCHDIR}/004* ${EXCLUDED}
mv -f ${PATCHDIR}/2* ${EXCLUDED}