diff options
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xfree/Manifest | 6 | ||||
| -rw-r--r-- | x11-base/xfree/files/digest-xfree-4.3.0-r3 | 2 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.3.0-r3.ebuild | 14 |
4 files changed, 19 insertions, 10 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index c3fe90bc5519..cde1cbc0e906 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xfree # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.221 2003/10/19 03:34:02 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.222 2003/10/19 21:57:44 spyderous Exp $ + + 19 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: + New PATCH_VER 2.1.20 does what should've been done in the first place. It + applies patch 9132 only if kernel is 2.4. Also inherit xfree eclass and change + bad uname things to is_kernel. 18 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild: New PATCH_VER 2.1.19. Pulling 9132_all_4.3.0-Mesa-SSE-fixes-from-MesaCVS.patch diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest index 87b3835e7013..304f86884aa6 100644 --- a/x11-base/xfree/Manifest +++ b/x11-base/xfree/Manifest @@ -1,11 +1,11 @@ -MD5 d536798be68ea207cbfb2d0007c421de ChangeLog 48532 +MD5 40060253f5834cd4a6e3be3827d06942 ChangeLog 48801 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228 MD5 d1ee4ee801fe27008bcb498ff5076621 xfree-4.1.0-r6.ebuild 2939 MD5 2e730b1127a59eabfc864b23049418d6 xfree-4.2.0-r12.ebuild 10299 MD5 e01435598f0611dafe440192d953b222 xfree-4.2.1-r2.ebuild 24143 MD5 c804610d686f931303be2e3b6fbd64d7 xfree-4.3.0-r1.ebuild 25077 MD5 c04adcd43638c959c60165a9faf01c7c xfree-4.3.0-r2.ebuild 31516 -MD5 019b6249a8a5483455fbfdc4fd510a3e xfree-4.3.0-r3.ebuild 33637 +MD5 16ff6af44322716a2d79e5d7eb2ce3e8 xfree-4.3.0-r3.ebuild 33711 MD5 ef2b50df4c12b5bcfe4e93224d7572fe xfree-4.3.99.14.ebuild 32135 MD5 3ce6003eac4a53cef9b1e6ce61520938 xfree-4.3.99.13.ebuild 32129 MD5 a9371704cf72bcb8d1aa713ca4b27546 files/XFree86-4.2.1-Xft11-Imakefile.patch 341 @@ -15,7 +15,7 @@ MD5 21d5f7a63f9dbf1948cc7df8b2bf67fc files/digest-xfree-4.2.0-r12 576 MD5 373ecdb2a152d8f047a7f08dffdc40af files/digest-xfree-4.2.1-r2 1267 MD5 be43a94caab2339e3a00372906f115a0 files/digest-xfree-4.3.0-r1 1384 MD5 5e35d44571378b1c3d647f2790cce1ad files/digest-xfree-4.3.0-r2 1928 -MD5 772f3ba08b32a37f51aafc27e7dbd70e files/digest-xfree-4.3.0-r3 2000 +MD5 ac766c3ad3b498ed0d6a8345be00d4fa files/digest-xfree-4.3.0-r3 2000 MD5 f9e626828f9782d15ddc9181ff29c402 files/digest-xfree-4.3.99.13 1391 MD5 90a1ea1e69e37a75e1a2640cf0761703 files/digest-xfree-4.3.99.14 1392 MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666 diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r3 b/x11-base/xfree/files/digest-xfree-4.3.0-r3 index 0f8f3cb91868..b647d93079ee 100644 --- a/x11-base/xfree/files/digest-xfree-4.3.0-r3 +++ b/x11-base/xfree/files/digest-xfree-4.3.0-r3 @@ -5,7 +5,7 @@ MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091 MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018 MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919 MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241 -MD5 d431f247186ca7ed4b9f7f44a7ca498a XFree86-4.3.0-patches-2.1.19.tar.bz2 423470 +MD5 68c9e827868fbf12d142aac54139d335 XFree86-4.3.0-patches-2.1.20.tar.bz2 424045 MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974 diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild index bf0ec4b93db2..af2ef32c0fde 100644 --- a/x11-base/xfree/xfree-4.3.0-r3.ebuild +++ b/x11-base/xfree/xfree-4.3.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 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-r3.ebuild,v 1.72 2003/10/19 03:34:02 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.73 2003/10/19 21:57:44 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 ... @@ -37,7 +37,7 @@ strip-flags # Are we using a snapshot ? USE_SNAPSHOT="no" -PATCH_VER="2.1.19" +PATCH_VER="2.1.20" FT2_VER="2.1.3" XCUR_VER="0.3.1" SISDRV_VER="131003-1" @@ -135,7 +135,7 @@ PROVIDE="virtual/x11 #inherit needs to happen *after* DEPEND has been defined to have "newdepend" #do the right thing. Otherwise RDEPEND doesn't get set properly. -inherit eutils flag-o-matic gcc +inherit eutils flag-o-matic gcc xfree DESCRIPTION="Xfree86: famous and free X server" @@ -250,6 +250,10 @@ src_unpack() { fi fi + # Bug #30541, workaround + is_kernel "2" "4" || \ + mv -f ${PATCH_DIR}/9132* ${PATCH_DIR}/excluded + # Various Patches from all over EPATCH_SUFFIX="patch" epatch ${PATCH_DIR} @@ -265,7 +269,7 @@ src_unpack() { # # http://people.mandrakesoft.com/~flepied/projects/wacom/ # - if [ "`uname -r | cut -d. -f1,2`" != "2.2" ] + if [ ! `is_kernel "2" "2"` ] then ebegin "Updating Wacom USB Driver" gzip -dc ${DISTDIR}/xf86Wacom.c.gz > \ @@ -317,7 +321,7 @@ src_unpack() { fi fi - if [ "`uname -r | cut -d. -f1,2`" != "2.2" ] + if [ ! `is_kernel "2" "2"` ] then echo "#define HasLinuxInput YES" >> config/cf/host.def fi |