Add depend on required autotools. Fix libtool problems on no-multlib systems. Fix rebuild when glut is already installed.

Package-Manager: portage-2.1.2_pre2

3 files changed, 122 insertions, 4 deletions

diff --git a/media-libs/glut/ChangeLog b/media-libs/glut/ChangeLog
index dd0d440b92ba..9493e6a538c8 100644
--- a/media-libs/glut/ChangeLog
+++ b/media-libs/glut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/glut
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/ChangeLog,v 1.25 2006/05/20 06:52:50 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/ChangeLog,v 1.26 2006/10/03 14:33:55 dsd Exp $
+
+  03 Oct 2006; Daniel Drake <dsd@gentoo.org>
+  +files/glut-3.7.1-new-autotools.patch, -glut-3.7-r2.ebuild,
+  glut-3.7.1.ebuild:
+  Add depend on required autotools. Fix libtool problems on no-multlib
+  systems. Fix rebuild when glut is already installed.
 
   20 May 2006; Donnie Berkholz <spyderous@gentoo.org>; glut-3.7-r2.ebuild,
   glut-3.7.1.ebuild:
diff --git a/media-libs/glut/files/glut-3.7.1-new-autotools.patch b/media-libs/glut/files/glut-3.7.1-new-autotools.patch
new file mode 100644
index 000000000000..8e747b674849
--- /dev/null
+++ b/media-libs/glut/files/glut-3.7.1-new-autotools.patch
@@ -0,0 +1,99 @@
+Index: Mesa-5.0/configure.in
+===================================================================
+--- Mesa-5.0.orig/configure.in
++++ Mesa-5.0/configure.in
+@@ -48,42 +48,6 @@ AM_MAINTAINER_MODE
+ AC_CONFIG_FILES(
+   Makefile
+   include/Makefile
+-  include/GL/Makefile
+-  src/Makefile
+-  src/array_cache/Makefile
+-  src/math/Makefile
+-  src/swrast/Makefile
+-  src/swrast_setup/Makefile
+-  src/tnl/Makefile
+-  src/Trace/Makefile
+-  src/FX/Makefile
+-  src/FX/X86/Makefile
+-  src/GGI/Makefile
+-  src/GGI/include/Makefile
+-  src/GGI/include/ggi/Makefile
+-  src/GGI/include/ggi/mesa/Makefile
+-  src/GGI/ggimesa.conf
+-  src/GGI/default/Makefile
+-  src/GGI/default/genkgi.conf
+-  src/GGI/display/Makefile
+-  src/GGI/display/fbdev.conf
+-  src/OSmesa/Makefile
+-  src/SVGA/Makefile
+-  src/X/Makefile
+-  src/X86/Makefile
+-  src/SPARC/Makefile
+-  util/Makefile
+-  ggi/demos/Makefile
+-  ggi/ggiglut/Makefile
+-  src-glu/Makefile
+-  si-glu/Makefile
+-  si-glu/include/Makefile
+-  si-glu/libnurbs/Makefile
+-  si-glu/libnurbs/interface/Makefile
+-  si-glu/libnurbs/internals/Makefile
+-  si-glu/libnurbs/nurbtess/Makefile
+-  si-glu/libtess/Makefile
+-  si-glu/libutil/Makefile
+ )
+ 
+ dnl ------------------------------------------
+@@ -420,6 +384,9 @@ if test x$with_ggi != xno; then
+   fi
+ fi
+ 
++build_ggi_fbdev_target=no
++build_ggi_genkgi_driver=no
++
+ AC_MSG_CHECKING(whether to build the GGI driver)
+ AC_MSG_RESULT($with_ggi)
+ if test "x$with_ggi" = xyes; then
+@@ -460,9 +427,11 @@ if test "x$with_ggi" = xyes; then
+     AC_MSG_RESULT(yes)
+   fi
+     
+-  AM_CONDITIONAL(HAVE_GGI_FBDEV, test $build_ggi_fbdev_target = yes)
+-  AM_CONDITIONAL(HAVE_GGI_GENKGI, test $build_ggi_genkgi_driver = yes)
+ fi
++
++AM_CONDITIONAL(HAVE_GGI_FBDEV, test $build_ggi_fbdev_target = yes)
++AM_CONDITIONAL(HAVE_GGI_GENKGI, test $build_ggi_genkgi_driver = yes)
++
+ ggi_confdir=$prefix/etc
+ ggi_libdir=$prefix/lib
+ AC_SUBST(ggi_confdir)
+Index: Mesa-5.0/Makefile.am
+===================================================================
+--- Mesa-5.0.orig/Makefile.am
++++ Mesa-5.0/Makefile.am
+@@ -28,8 +28,8 @@ exec:
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) exec); \
+ 	done;
+ 
+-DIST_SUBDIRS = include src si-glu src-glu @glut_dir@ $(SUB_DEMOS) util
+-SUBDIRS = include src $(sel_sub_glu) $(sel_sub_glut) $(sel_sub_demos) util
++DIST_SUBDIRS = include @glut_dir@
++SUBDIRS = include $(sel_sub_glut)
+ 
+ EXTRA_DIST = \
+ 	3Dfx \
+Index: Mesa-5.0/demos/Makefile.am
+===================================================================
+--- Mesa-5.0.orig/demos/Makefile.am
++++ Mesa-5.0/demos/Makefile.am
+@@ -44,7 +44,7 @@ check_PROGRAMS = bounce \
+ 	tunnel2 \
+ 	winpos
+ 
+-#	osdemo \
++#	osdemo
+ 
+ 
+ CLEANFILES = test.ppm
diff --git a/media-libs/glut/glut-3.7.1.ebuild b/media-libs/glut/glut-3.7.1.ebuild
index eb3cb0c28c7f..151fa0ade16e 100644
--- a/media-libs/glut/glut-3.7.1.ebuild
+++ b/media-libs/glut/glut-3.7.1.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7.1.ebuild,v 1.30 2006/05/20 06:52:50 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7.1.ebuild,v 1.31 2006/10/03 14:33:55 dsd Exp $
 
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
 inherit autotools eutils
 
 MESA_VER="5.0"
@@ -25,12 +27,23 @@ S="${WORKDIR}/Mesa-${MESA_VER}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
+	# Remove ancient libtool shipped in tarball
+	rm m4/libtool.m4
+
+	# Remove acinclude.m4 because we regenerate this into aclocal.m4 during
+	# eautoreconf
+	rm acinclude.m4
+
+	epatch "${FILESDIR}/${P}-new-autotools.patch"
 	epatch "${FILESDIR}/${P}-fix-GLU-linking.patch"
-	eautoreconf
+	AT_M4DIR=m4 eautoreconf
 }
 
 src_compile() {
-	econf || die
+	# --without-glut flag actually refers to whether mesa would build with or
+	# without *external* glut, in this case we want the internal one
+	econf --without-glut || die
 	cd "${S}"/src-glut
 	emake || die "emake failed"
 }