bug fixes

5 files changed, 112 insertions, 111 deletions

diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index 28c66c35871c..b904fff66b32 100644
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,11 +1,19 @@
 # ChangeLog for media-libs/allegro
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.2 2002/04/14 17:43:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.3 2002/04/30 09:09:06 seemant Exp $
+
+*allegro-4.0.1 (30 Apr 2002)
+
+  30 Apr 2002; Seemant Kulleen <seemant@gentoo.org> allegro-4.0.1-r1.ebuild
+  files/digest-allegro-4.0.1-r1 :
+
+  Added tetex USE flag dependent dvi documentation compilation.  This fixes 
+  bug # 2266 by rparker@ntlworld.com (Robin Parker)
 
 *allegro-4.0.1 (14 Apr 2002)
 
   14 Apr 2002; Seemant Kulleen <seemant@gentoo.org> allegro-4.0.1.ebuild
-  files/digest-allegro-4.0.1.ebuild :
+  files/digest-allegro-4.0.1 :
 
   Version bump, and changed the fbcon USE flag to just fb
 
diff --git a/media-libs/allegro/allegro-3.9.37.ebuild b/media-libs/allegro/allegro-3.9.37.ebuild
deleted file mode 100644
index cdccf69cdecf..000000000000
--- a/media-libs/allegro/allegro-3.9.37.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Dan Armak <danarmak@gantoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-3.9.37.ebuild,v 1.1 2001/07/21 14:42:00 danarmak Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Allegro is a cross-platform multimedia library"
-
-SRC_URI="http://prdownloads.sourceforge.net/alleg/${P}.tar.gz"
-
-HOMEPAGE="http://alleg.sourceforge.net/allegro/"
-
-DEPEND="X? ( virtual/x11 )"
-
-src_compile() {
-    
-    confopts="--infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST}"
-    
-    # Static and shared libs can be build at the same time
-    confopts="${confopts} --enable-shared --enable-static"
-    
-    # Always enable Linux console support and accompanying drivers
-    confopts="${confopts} --enable-linux --enable-vga"
-    
-    # if USE static defined, use static library as default to link with
-    if [ "`use static`" ]
-    then 
-        confopts="${confopts} --enable-staticprog"
-    fi
-    
-    # Pentium optimizations
-    if [ ${CHOST} = "i586-pc-linux-gnu" -o ${CHOST} = "i686-pc-linux-gnu" ]
-    then 
-        confopts="${confopts} --enable-pentiumopts"
-    fi
-    
-    # Use MMX instructions
-    if [ "`use mmx`" ]
-    then 
-        confopts="${confopts} --enable-mmx"
-    else
-        confopts="${confopts} --enable-mmx=no"
-    fi
-    
-    # Have OSS support
-    if [ "`use oss`" ] ; then 
-        confopts="${confopts} --enable-ossdigi --enable-ossmidi"
-    else
-        confopts="${confopts} --disable-ossdigi --disable-ossmidi"
-    fi
-    
-    # Have ALSA support
-    if [ "`use alsa`" ] ; then 
-        confopts="${confopts} --enable-alsadigi --enable-alsamidi"
-    else
-        confopts="${confopts} --disable-alsadigi --disable-alsamidi"
-    fi
-    
-    # Have ESD support
-    if [ "`use esd`" ] ; then 
-        confopts="${confopts} --enable-esddigi"
-    else
-        confopts="${confopts} --disable-esddigi"
-    fi
-    
-    # Have X11 support
-    if [ "`use X`" ] ; then 
-        confopts="${confopts} --with-x --enable-xwin-shm --enable-xwin-vidmode --enable-xwin-dga --enable-xwin-dga2"
-    else
-        confopts="${confopts} --without-x --disable-xwin-shm --disable-xwin-vidmode --disable-xwin-dga --disable-xwin-dga2"
-    fi
-    
-    # Have SVGALib support
-    if [ "`use svga`" ] ; then 
-        confopts="${confopts} --enable-svgalib"
-    else
-        confopts="${confopts} --disable-svgalib"
-    fi
-    
-    # Have fbcon support
-    if [ "`use fbcon`" ] ; then 
-        confopts="${confopts} --enable-fbcon"
-    else
-        confopts="${confopts} --disable-fbcon"
-    fi
-
-    # --------------
-
-    try ./configure ${confopts}
-    
-    # emake doesn't work
-    try make
-    
-    try make docs-ps docs-dvi
-    
-}
-
-src_install () {
-	
-    try make prefix=${D}/usr infodir=${D}/usr/share/info mandir=${D}/usr/share/man install install-gzipped-man install-gzipped-info
-    
-    cd ${S}
-    # Different format versions of the Allegro documentation
-    dodoc allegro.dvi allegro.ps allegro.txt 
-    
-}
-
diff --git a/media-libs/allegro/allegro-4.0.1-r1.ebuild b/media-libs/allegro/allegro-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..556141ac9f7a
--- /dev/null
+++ b/media-libs/allegro/allegro-4.0.1-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Dan Armak <danarmak@gantoo.org>
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.0.1-r1.ebuild,v 1.1 2002/04/30 09:09:06 seemant Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Allegro is a cross-platform multimedia library"
+SRC_URI="http://prdownloads.sourceforge.net/alleg/${P}.tar.gz"
+HOMEPAGE="http://alleg.sourceforge.net/"
+
+DEPEND="X? ( virtual/x11 )
+	tetex? ( app-text/tetex )"
+
+src_compile() {
+	
+	use tetex && einfo "TETEX baby!!"
+	
+	# Always enable Linux console support and accompanying drivers
+	confopts="${confopts} --enable-linux --enable-vga"
+	
+	# if USE static defined, use static library as default to link with
+	use static \
+		&& confopts="${confopts} --enable-staticprog --enable-static"
+	
+	# Pentium optimizations
+	if [ ${CHOST} = "i586-pc-linux-gnu" -o ${CHOST} = "i686-pc-linux-gnu" ]
+	then 
+		confopts="${confopts} --enable-pentiumopts"
+	fi
+	
+	# Use MMX instructions
+	use mmx \
+		&& confopts="${confopts} --enable-mmx" \
+		|| confopts="${confopts} --enable-mmx=no"
+	
+	# Have OSS support
+	use oss \
+		&& confopts="${confopts} --enable-ossdigi --enable-ossmidi" \
+		|| confopts="${confopts} --disable-ossdigi --disable-ossmidi"
+	
+	# Have ALSA support
+	use alsa \
+		&& confopts="${confopts} --enable-alsadigi --enable-alsamidi" \
+		|| confopts="${confopts} --disable-alsadigi --disable-alsamidi"
+	
+	# Have ESD support
+	use esd \
+		&& confopts="${confopts} --enable-esddigi" \
+		|| confopts="${confopts} --disable-esddigi"
+	
+	# Have X11 support
+	use X \
+		&& confopts="${confopts} \
+			--with-x \
+			--enable-xwin-shm \
+			--enable-xwin-vidmode \
+			--enable-xwin-dga \
+			--enable-xwin-dga2" \
+		|| confopts="${confopts} \
+			--without-x \
+			--disable-xwin-shm \
+			--disable-xwin-vidmode \
+			--disable-xwin-dga \
+			--disable-xwin-dga2"
+	
+	# Have SVGALib support
+	use svga \
+		&& confopts="${confopts} --enable-svgalib" \
+		|| confopts="${confopts} --disable-svgalib"
+	
+	# Have fbcon support
+	use fbcon \
+		&& confopts="${confopts} --enable-fbcon" \
+		|| confopts="${confopts} --disable-fbcon"
+
+	# --------------
+
+	econf ${confopts} || die
+	
+	# emake doesn't work
+	make || die
+	
+	use tetex && ( \
+		make docs-dvi docs-ps || die
+	)
+	
+}
+
+src_install () {
+	
+	make \
+		prefix=${D}/usr \
+		infodir=${D}/usr/share/info \
+		mandir=${D}/usr/share/man \
+		install install-gzipped-man install-gzipped-info || die
+	
+	cd ${S}
+	# Different format versions of the Allegro documentation
+	dodoc allegro.txt 
+	use tetex && dohtml allegro.dvi allegro.ps
+}
diff --git a/media-libs/allegro/files/digest-allegro-3.9.37 b/media-libs/allegro/files/digest-allegro-3.9.37
deleted file mode 100644
index 5823fccb3a37..000000000000
--- a/media-libs/allegro/files/digest-allegro-3.9.37
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f930cd6277cf12397488dec0e5bb4d9 allegro-3.9.37.tar.gz 1718567
diff --git a/media-libs/allegro/files/digest-allegro-4.0.1-r1 b/media-libs/allegro/files/digest-allegro-4.0.1-r1
new file mode 100644
index 000000000000..d431fa1df4e3
--- /dev/null
+++ b/media-libs/allegro/files/digest-allegro-4.0.1-r1
@@ -0,0 +1 @@
+MD5 224296524ffafc8369f3b29f5b73cdcb allegro-4.0.1.tar.gz 2391111