added new savage driver (1.1.27t), prior versions do not work

3 files changed, 16 insertions, 8 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 1c09e993c7fc..5852f7d8a6bc 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.92 2003/02/12 09:21:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.93 2003/02/15 18:49:15 hannes Exp $
+
+  15 Feb 2003; Hannes Mehnert <hannes@gentoo.org> xfree-4.2.99.4.ebuild:
+
+  bumped savage driver to 1.1.27t (prior versions do not work). also added
+  dep on app-arch/unzip (because 1.1.27t is a .zip)
 
   09 Feb 2003; Luca Barbato <lu_zero@gentoo.org> :
 
diff --git a/x11-base/xfree/files/digest-xfree-4.2.99.4 b/x11-base/xfree/files/digest-xfree-4.2.99.4
index 4d658fa5563e..7cc37843cd7f 100644
--- a/x11-base/xfree/files/digest-xfree-4.2.99.4
+++ b/x11-base/xfree/files/digest-xfree-4.2.99.4
@@ -4,7 +4,7 @@ MD5 dc5d49fe6b6e91b9d6817baff6898388 X4.2.99.4-3.tar.bz2 12811390
 MD5 b308de3cbfdd87bb8436384517e6f924 X4.2.99.4-4.tar.bz2 16671535
 MD5 4ecbe985e304445695dc82af0a532988 XFree86-4.2.99.4-patches-1.1.tar.bz2 232640
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
-MD5 5511a37ede0f6561c2dad26634b42e87 savage-1.1.26t.tgz 69707
+MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
 MD5 8fe0419ad622053ae0e98f42c23ac3d5 sis_drv_src_141202-1.tar.gz 317440
 MD5 cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe 198384
 MD5 9637df0e91703179f0723ec095a36cb5 arial32.exe 554208
diff --git a/x11-base/xfree/xfree-4.2.99.4.ebuild b/x11-base/xfree/xfree-4.2.99.4.ebuild
index 42e1800ea7f9..5d70ed5f82c2 100644
--- a/x11-base/xfree/xfree-4.2.99.4.ebuild
+++ b/x11-base/xfree/xfree-4.2.99.4.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.2.99.4.ebuild,v 1.6 2003/02/13 16:54:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.99.4.ebuild,v 1.7 2003/02/15 18:49:15 hannes 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 ...
@@ -41,7 +41,7 @@ USE_SNAPSHOT="yes"
 PATCH_VER="1.1"
 FT2_VER="2.1.3"
 SISDRV_VER="141202-1"
-SAVDRV_VER="1.1.26t"
+SAVDRV_VER="1.1.27t"
 
 BASE_PV="${PV}"
 MY_SV="${BASE_PV//\.}"
@@ -57,7 +57,7 @@ HOMEPAGE="http://www.xfree.org"
 X_PATCHES="mirror://gentoo/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2"
 
 X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz
-	http://www.probo.com/timr/savage-${SAVDRV_VER}.tgz
+	http://www.probo.com/timr/savage-${SAVDRV_VER}.zip
 	http://www.webit.at/~twinny/sis/sis_drv_src_${SISDRV_VER}.tar.gz"
 #	3dfx? ( mirror://gentoo/glide3-headers.tar.bz2 )"
 # Updated Wacom driver:  http://people.mandrakesoft.com/~flepied/projects/wacom/
@@ -111,7 +111,8 @@ DEPEND=">=sys-apps/baselayout-1.8.3
 	>=x11-base/opengl-update-1.4
 	>=x11-misc/ttmkfdir-3.0.4
 	pam? ( >=sys-libs/pam-0.75 )
-	truetype? ( app-arch/cabextract )"
+	truetype? ( app-arch/cabextract )
+	app-arch/unzip" # needed for savage driver (version 1.1.27t)
 	
 RDEPEND=">=sys-apps/baselayout-1.8.3
 	>=sys-libs/ncurses-5.1
@@ -164,9 +165,11 @@ src_unpack() {
 	unset EPATCH_EXCLUDE
 
 	# Update the Savage Driver
+	# savage driver 1.1.27t is a .zip and contains a savage directory
+	# (that's why we have to be in drivers, not in savage subdir).
 	ebegin "Updating Savage driver"
-	cd ${S}/programs/Xserver/hw/xfree86/drivers/savage
-	tar -zxf ${DISTDIR}/savage-${SAVDRV_VER}.tgz || die
+	cd ${S}/programs/Xserver/hw/xfree86/drivers
+	unzip -oqq ${DISTDIR}/savage-${SAVDRV_VER}.zip || die
 	eend 0
     
 	# Update the SIS Driver