resolve bug #2012

7 files changed, 13 insertions, 125 deletions

diff --git a/media-libs/glide-v3/ChangeLog b/media-libs/glide-v3/ChangeLog
index 7c47ac53092c..6abf8dd77ee1 100644
--- a/media-libs/glide-v3/ChangeLog
+++ b/media-libs/glide-v3/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/glide-v3
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/ChangeLog,v 1.4 2002/04/15 10:23:58 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/ChangeLog,v 1.5 2002/04/25 18:58:43 azarah Exp $
+
+*glide-v3-3.10-r3 (26 Apr 2002)
+
+  26 Apr 2002; M.Schlemmer <azarah@gentoo.org> glide-v3-3.10-r3.ebuild :
+
+  Resolve bug #2012.  Optimizations applied to the build caused it to be
+  very unstable.
 
 *glide-v3-3.10-r2 (15 Apr 2002)
 
diff --git a/media-libs/glide-v3/files/digest-glide-v3-3.10-r1 b/media-libs/glide-v3/files/digest-glide-v3-3.10-r1
deleted file mode 100644
index 52168ebc368b..000000000000
--- a/media-libs/glide-v3/files/digest-glide-v3-3.10-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 322250849c105f9b7d7e3690c69ed474 glide3x-3.10.tar.gz 3055109
-MD5 dec0b3a17912934f6da79f57cd0a802c swlibs-3.10.tar.gz 596883
diff --git a/media-libs/glide-v3/files/digest-glide-v3-3.10-r2 b/media-libs/glide-v3/files/digest-glide-v3-3.10-r2
deleted file mode 100644
index 52168ebc368b..000000000000
--- a/media-libs/glide-v3/files/digest-glide-v3-3.10-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 322250849c105f9b7d7e3690c69ed474 glide3x-3.10.tar.gz 3055109
-MD5 dec0b3a17912934f6da79f57cd0a802c swlibs-3.10.tar.gz 596883
diff --git a/media-libs/glide-v3/files/digest-glide-v3-3.10 b/media-libs/glide-v3/files/digest-glide-v3-3.10-r3
index 52168ebc368b..52168ebc368b 100644
--- a/media-libs/glide-v3/files/digest-glide-v3-3.10
+++ b/media-libs/glide-v3/files/digest-glide-v3-3.10-r3
diff --git a/media-libs/glide-v3/glide-v3-3.10-r1.ebuild b/media-libs/glide-v3/glide-v3-3.10-r1.ebuild
deleted file mode 100644
index 588e79555fe3..000000000000
--- a/media-libs/glide-v3/glide-v3-3.10-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Travis Tilley <lordviram@nesit.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/glide-v3-3.10-r1.ebuild,v 1.1 2002/02/17 18:30:02 azarah Exp $
-
-S=${WORKDIR}/${PN/-v3/3x}
-DESCRIPTION="Hardware support for the voodoo3, voodoo4 and voodoo5"
-SRC_URI="http://www.ibiblio.org/gentoo/distfiles/glide3x-${PV}.tar.gz
-	http://www.ibiblio.org/gentoo/distfiles/swlibs-${PV}.tar.gz"
-# check for future updates here
-# http://telia.dl.sourceforge.net/mirrors/slackware/slackware-8.0/contrib/contrib-sources/3dfx/voodoo4_voodoo5/
-HOMEPAGE="http://glide.sourceforge.net/"
-
-DEPEND=">=sys-devel/automake-1.4
-	>=sys-devel/autoconf-2.13
-	>=sys-devel/libtool-1.3.3
-	>=sys-devel/m4-1.4
-	>=sys-devel/perl-5.005"
-
-PROVIDE="virtual/glide"
-
-if [ "`use voodoo3`" ] ; then
-	compilefor="h3"
-else
-	compilefor="h5"
-fi
-
-src_compile() {
-	cd ${WORKDIR}
-	chmod +x swlibs/include/make/ostype
-	cd ${WORKDIR}/glide3x ; ln -fs ${WORKDIR}/swlibs swlibs
-	cd ${WORKDIR}/glide3x/h3/minihwc ; ln -fs linhwc.c.dri linhwc.c
-	cd ${WORKDIR}/glide3x/h3/glide3/src ; ln -fs gglide.c.dri gglide.c
-	ln -fs gsst.c.dri gsst.c ; ln -fs glfb.c.dri glfb.c
-	
-	cd ${WORKDIR}/glide3x
-	libtoolize -f && aclocal && automake && autoconf
-	mkdir build
-	cd build
-	../configure --prefix=/usr \
-		--enable-fx-glide-hw=$compilefor \
-		--enable-fx-dri-build || die
-		
-	./build.3dfx all || die
-}
-
-src_install() {
-	cd ${WORKDIR}/glide3x/build
-	./build.3dfx DESTDIR=${D} install || die
-
-	dodir /usr/X11R6/lib
-	dosym /usr/lib/libglide3.so.${PV}.0 /usr/X11R6/lib/libglide3.so
-}
-
diff --git a/media-libs/glide-v3/glide-v3-3.10-r2.ebuild b/media-libs/glide-v3/glide-v3-3.10-r3.ebuild
index dd72688ce4a1..0b951a6c52f4 100644
--- a/media-libs/glide-v3/glide-v3-3.10-r2.ebuild
+++ b/media-libs/glide-v3/glide-v3-3.10-r3.ebuild
@@ -1,7 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Travis Tilley <lordviram@nesit.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/glide-v3-3.10-r2.ebuild,v 1.2 2002/04/15 10:23:58 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/glide-v3-3.10-r3.ebuild,v 1.1 2002/04/25 18:58:43 azarah Exp $
+
+# NOTE:  Do NOT build this with optimizations, as it will make this package
+#        unstable!!!!
 
 S=${WORKDIR}/${PN/-v3/3x}
 DESCRIPTION="Hardware support for the voodoo3, voodoo4 and voodoo5"
@@ -33,11 +36,6 @@ src_unpack() {
 	cd ${S}/h3/glide3/src ; ln -fs gglide.c.dri gglide.c
 	ln -fs gsst.c.dri gsst.c ; ln -fs glfb.c.dri glfb.c
 	
-	cd ${WORKDIR}/swlibs/include/make
-	cp makefile.autoconf.bottom makefile.autoconf.bottom.orig
-	sed -e "s:-O6 -m486:${CFLAGS}:" makefile.autoconf.bottom.orig \
-		> makefile.autoconf.bottom
-	
 	cd ${S}
 	libtoolize -f && aclocal && automake && autoconf
 }
@@ -59,3 +57,4 @@ src_install() {
 	dodir /usr/X11R6/lib
 	dosym /usr/lib/libglide3.so.${PV}.0 /usr/X11R6/lib/libglide3.so
 }
+
diff --git a/media-libs/glide-v3/glide-v3-3.10.ebuild b/media-libs/glide-v3/glide-v3-3.10.ebuild
deleted file mode 100644
index 68b99cc68357..000000000000
--- a/media-libs/glide-v3/glide-v3-3.10.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Travis Tilley <lordviram@nesit.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/glide-v3-3.10.ebuild,v 1.4 2002/01/29 17:36:32 azarah Exp $
-
-S=${WORKDIR}/${PN/-v3/3x}
-DESCRIPTION="Hardware support for the voodoo3, voodoo4 and voodoo5"
-SRC_URI="http://www.ibiblio.org/gentoo/distfiles/glide3x-${PV}.tar.gz
-	http://www.ibiblio.org/gentoo/distfiles/swlibs-${PV}.tar.gz"
-# check for future updates here
-# http://telia.dl.sourceforge.net/mirrors/slackware/slackware-8.0/contrib/contrib-sources/3dfx/voodoo4_voodoo5/
-HOMEPAGE="http://glide.sourceforge.net/"
-
-DEPEND=">=sys-devel/automake-1.4
-	>=sys-devel/autoconf-2.13
-	>=sys-devel/libtool-1.3.3
-	>=sys-devel/m4-1.4
-	>=sys-devel/perl-5.005"
-
-PROVIDE="virtual/glide"
-
-if [ "`use voodoo3`" ] ; then
-	compilefor="h3"
-elif [ "`use voodoo4`" ] ; then
-	compilefor="h5"
-elif [ "`use voodoo5`" ] ; then
-	compilefor="h5"
-else
-#	die "You need voodoo3, voodoo4 or voodoo5 in your USE !!!"
-# if we do this, a emerge --world update fails for people not using voodoo's,
-# so default to h3 for now
-	compilefor="h3"
-fi
-
-src_compile() {
-	cd ${WORKDIR}
-	chmod +x swlibs/include/make/ostype
-	cd ${WORKDIR}/glide3x ; ln -fs ${WORKDIR}/swlibs swlibs
-	cd ${WORKDIR}/glide3x/h3/minihwc ; ln -fs linhwc.c.dri linhwc.c
-	cd ${WORKDIR}/glide3x/h3/glide3/src ; ln -fs gglide.c.dri gglide.c
-	ln -fs gsst.c.dri gsst.c ; ln -fs glfb.c.dri glfb.c
-	
-	cd ${WORKDIR}/glide3x
-	libtoolize -f && aclocal && automake && autoconf
-	mkdir build
-	cd build
-	../configure --prefix=/usr \
-		--enable-fx-glide-hw=$compilefor \
-		--enable-fx-dri-build || die
-		
-	./build.3dfx all || die
-}
-
-src_install() {
-	cd ${WORKDIR}/glide3x/build
-	./build.3dfx DESTDIR=${D} install || die
-
-	dodir /usr/X11R6/lib
-	dosym /usr/lib/libglide3.so.${PV}.0 /usr/X11R6/lib/libglide3.so
-}