repoman'd

4 files changed, 53 insertions, 201 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 50bac3178725..2c90436257fc 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/mesa
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.1 2002/02/01 21:53:30 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.2 2002/07/23 00:12:54 seemant Exp $
+
+*mesa-3.5 (22 Jul 2002)
+
+  22 Jul 2002; Seemant Kulleen <seemant@gentoo.org> mesa-3.5.ebuild
+  files/digest-mesa-3.5 :
+
+  This was updated a while ago. I repoman'd it, and cleaned up spacing and
+  syntax a little.
 
 *mesa-3.4.2 (1 Feb 2002)
 
diff --git a/media-libs/mesa/files/digest-mesa-3.4.2 b/media-libs/mesa/files/digest-mesa-3.4.2
deleted file mode 100644
index bd27ef0d591f..000000000000
--- a/media-libs/mesa/files/digest-mesa-3.4.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5bad47f1f86a87b2a35e8c8c33d97e4a MesaLib-3.4.2.tar.bz2 1380805
-MD5 b3a7b01dae8b1f09f951f9257c242b08 MesaDemos-3.4.2.tar.bz2 854130
diff --git a/media-libs/mesa/mesa-3.4.2.ebuild b/media-libs/mesa/mesa-3.4.2.ebuild
deleted file mode 100644
index 32c12a84944f..000000000000
--- a/media-libs/mesa/mesa-3.4.2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-3.4.2.ebuild,v 1.5 2002/07/11 06:30:39 drobbins Exp $
-
-MY_P=Mesa-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="OpenGL like graphic library for Linux"
-SRC_URI="http://download.sourceforge.net/mesa3d/MesaLib-${PV}.tar.bz2
-         http://download.sourceforge.net/mesa3d/MesaDemos-${PV}.tar.bz2"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-DEPEND="virtual/glibc
-        X? ( virtual/x11 )
-        ggi? ( >=media-libs/libggi-2.0_beta3 )
-        svga? ( >=media-libs/svgalib-1.4.2-r1 )"
-
-if [ "`use X`" ]
-then
-	PROVIDE="virtual/opengl virtual/glu virtual/glut"
-else
-	PROVIDE="virtual/opengl"
-fi
-
-src_compile() {
-	local myconf
-
-	if [ "`use mmx`" ]
-	then
-		myconf="--enable-mmx"
-	else
-		myconf="--disable-mmx"
-	fi
-
-	if [ "`use 3dnow`" ]
-	then
-		myconf="${myconf} --enable-3dnow"
-	else
-		myconf="${myconf} --disable-3dnow"
-	fi
-
-	if [ "`use sse`" ]
-	then
-		myconf="${myconf} --enable-sse"
-	else
-		myconf="${myconf} --disable-sse"
-	fi
-
-	if [ "`use X`" ]
-	then
-		myconf="${myconf} --with-x --without-glut"
-		# --without-glut means that mesa is forced to use and install
-		# his own version of glut.
-	else
-		myconf="${myconf} --without-x"
-		rm -rf src-glut
-	fi
-
-	if [ -z "`use ggi`" ] || [ -z "`use fbcon`" ]
-	then
-		myconf="${myconf} --disable-ggi-fbdev --without-ggi"
-	fi
-
-	if [ -z "`use svga`" ]
-	then
-		myconf="${myconf} --without-svga"
-	fi
-
-	cp configure configure.orig
-	sed -e "s:^ggi_confdir.*:ggi_confdir=/etc/ggi:" \
-		-e "s:^ggi_libdir.*:ggi_libdir=\$prefix/lib:" \
-		configure.orig > configure
-
-	./configure --prefix=/usr --sysconfdir=/etc/mesa --host=${CHOST} $myconf \
-		|| die
-
-	if [ "`use ggi`" ] && [ "`use fbcon`" ]
-	then
-		cd ${S}/src/GGI
-		cp Makefile Makefile.orig
-		sed -e "s:^ggimesaconfdatadir.*:ggimesaconfdatadir = \${ggi_confdir}:" \
-			Makefile.orig > Makefile
-
-		cd ${S}/src/GGI/default
-		cp stubs.c stubs.c.orig
-		sed -e "s:Texture.Enabled:Texture.ReallyEnabled:" stubs.c.orig > stubs.c
-
-		cd ${S}/src/GGI/include/ggi/mesa
-		cp display_fbdev.h display_fbdev.h.orig
-		sed -e "s:fbdev_hook:ggi_fbdev_priv:" display_fbdev.h.orig > display_fbdev.h
-
-		cd ${S}
-		mkdir gg
-		ln -s /usr/lib/libgg*.so .
-	fi
-
-	make || die
-	# Don't worry about errors or failures in making the demos
-	cd ${S}/demos; for f in *.c; do make "${f%.c}"; done
-	cd ${S}/xdemos; for f in *.c; do make "${f%.c}"; done
-
-	if [ "`use ggi`" ]
-	then
-		cd ${S}/ggi/ggiglut
-		make libglut_la_LIBADD="-lggi -lgg -L${S}/src/.libs -lGL" \
-			|| die
-	fi
-}
-
-src_install () {
-	if [ "`use ggi`" ]
-	then
-	  cd ggi/ggiglut
-	  make DESTDIR=${D} install || die
-	  cd ${D}/usr/lib
-	  cp libglut.la libglut.orig
-	  sed -e "s:-L${S}/src/.libs::g" libglut.orig > libglut.la
-	  rm libglut.orig
-	fi
-	cd ${S}
-	make DESTDIR=${D} install || die
-	cd ${D}/usr/lib
-	if [ "$PN" = "mesa-glu" ]
-	then
-		rm -f libGL.*
-		rm -f ../include/GL/gl.h
-		rm -f ../include/GL/glx.h
-		rm -f ../include/GL/osmesa.h
-	else
-		ln -s libGL.so.2.1.030402 libMesaGL.so.3
-	fi
-	ln -s libGLU.so.1.1.030402 libMesaGLU.so.3
-
-	cd ${S}
-	dodoc docs/*
-
-	# Install any demos that successfully built
-	for d in demos xdemos; do
-		exeinto /usr/lib/mesa-$PV/$d
-		cd ${S}/$d
-		for f in *.c; do [ -f "${f%.c}" ] && doexe "${f%.c}"; done
-	done
-}
diff --git a/media-libs/mesa/mesa-3.5.ebuild b/media-libs/mesa/mesa-3.5.ebuild
index 0c17ddb68ec5..941ba9c440b9 100644
--- a/media-libs/mesa/mesa-3.5.ebuild
+++ b/media-libs/mesa/mesa-3.5.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-3.5.ebuild,v 1.3 2002/07/11 06:30:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-3.5.ebuild,v 1.4 2002/07/23 00:12:54 seemant Exp $
 
 MY_P=Mesa-${PV}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="OpenGL like graphic library for Linux"
 SRC_URI="http://download.sourceforge.net/mesa3d/MesaLib-${PV}.tar.bz2
-         http://download.sourceforge.net/mesa3d/MesaDemos-${PV}.tar.bz2"
+	 http://download.sourceforge.net/mesa3d/MesaDemos-${PV}.tar.bz2"
 HOMEPAGE="http://mesa3d.sourceforge.net/"
 
-DEPEND="virtual/glibc
-        X? ( virtual/x11 )
-        ggi? ( >=media-libs/libggi-2.0_beta3 )
-        svga? ( >=media-libs/svgalib-1.4.2-r1 )"
+DEPEND="X? ( virtual/x11 )
+	ggi? ( >=media-libs/libggi-2.0_beta3 )
+	svga? ( >=media-libs/svgalib-1.4.2-r1 )"
 
 if [ "`use X`" ]
 then
@@ -21,60 +20,49 @@ else
 	PROVIDE="virtual/opengl"
 fi
 
+SLOT="3.5"
+LICENSE="LGPL-2"
+KEYWORDS="x86"
+
 src_compile() {
 	local myconf
 
-	if [ "`use mmx`" ]
-	then
-		myconf="--enable-mmx"
-	else
-		myconf="--disable-mmx"
-	fi
+	use mmx \
+		&& myconf="--enable-mmx" \
+		|| myconf="--disable-mmx"
 
-	if [ "`use 3dnow`" ]
-	then
-		myconf="${myconf} --enable-3dnow"
-	else
-		myconf="${myconf} --disable-3dnow"
-	fi
+	use 3dnow \
+		&& myconf="${myconf} --enable-3dnow" \
+		|| myconf="${myconf} --disable-3dnow"
 
-	if [ "`use sse`" ]
-	then
-		myconf="${myconf} --enable-sse"
-	else
-		myconf="${myconf} --disable-sse"
-	fi
+	use sse \
+		&& myconf="${myconf} --enable-sse" \
+		|| myconf="${myconf} --disable-sse"
 
-	if [ "`use X`" ]
-	then
+	use X && ( \
 		myconf="${myconf} --with-x --without-glut"
 		# --without-glut means that mesa is forced to use and install
 		# his own version of glut.
-	else
+	) || ( \
 		myconf="${myconf} --without-x"
 		rm -rf src-glut
-	fi
+	)
 
-	if [ -z "`use ggi`" ] || [ -z "`use fbcon`" ]
-	then
-		myconf="${myconf} --disable-ggi-fbdev --without-ggi"
-	fi
+	( use ggi && use fbcon ) \
+		|| myconf="${myconf} --disable-ggi-fbdev --without-ggi"
 
-	if [ -z "`use svga`" ]
-	then
-		myconf="${myconf} --without-svga"
-	fi
+	use svga || myconf="${myconf} --without-svga"
 
 	cp configure configure.orig
 	sed -e "s:^ggi_confdir.*:ggi_confdir=/etc/ggi:" \
 		-e "s:^ggi_libdir.*:ggi_libdir=\$prefix/lib:" \
 		configure.orig > configure
 
-	./configure --prefix=/usr --sysconfdir=/etc/mesa --host=${CHOST} $myconf \
-		|| die
+	econf \
+		--sysconfdir=/etc/mesa \
+		${myconf} || die
 
-	if [ "`use ggi`" ] && [ "`use fbcon`" ]
-	then
+	( use ggi && use fbcon ) && ( \
 		cd ${S}/src/GGI
 		cp Makefile Makefile.orig
 		sed -e "s:^ggimesaconfdatadir.*:ggimesaconfdatadir = \${ggi_confdir}:" \
@@ -91,28 +79,27 @@ src_compile() {
 		cd ${S}
 		mkdir gg
 		ln -s /usr/lib/libgg*.so .
-	fi
+	)
 
 	emake || die
 
-	if [ "`use ggi`" ]
-	then
+	use ggi && ( \
 		cd ${S}/ggi/ggiglut
-		make libglut_la_LIBADD="-lggi -lgg -L${S}/src/.libs -lGL" \
-			|| die
-	fi
+		make \
+			libglut_la_LIBADD="-lggi -lgg -L${S}/src/.libs -lGL" || die
+	)
 }
 
 src_install () {
-	if [ "`use ggi`" ]
-	then
-	  cd ggi/ggiglut
-	  make DESTDIR=${D} install || die
-	  cd ${D}/usr/lib
-	  cp libglut.la libglut.orig
-	  sed -e "s:-L${S}/src/.libs::g" libglut.orig > libglut.la
-	  rm libglut.orig
-	fi
+	use ggi && ( \
+		cd ggi/ggiglut
+		make DESTDIR=${D} install || die
+		cd ${D}/usr/lib
+		cp libglut.la libglut.orig
+		sed -e "s:-L${S}/src/.libs::g" libglut.orig > libglut.la
+		rm libglut.orig
+	)
+
 	cd ${S}
 	make DESTDIR=${D} install || die
 	cd ${D}/usr/lib
@@ -129,5 +116,6 @@ src_install () {
 
 	cd ${S}
 	dodoc docs/*
-	#we no longer install demos since they seem to be linked for built-time testing only.
+	#we no longer install demos since they seem to be linked 
+	# for built-time testing only.
 }