--as-needed-patch thanks to TGL <degrenier@easyconnect.fr> in bug 131837, add metadata, games herd

(Portage version: 2.1_rc1-r2)

4 files changed, 39 insertions, 4 deletions

diff --git a/media-libs/glut/ChangeLog b/media-libs/glut/ChangeLog
index 8f593538420c..d5647477082e 100644
--- a/media-libs/glut/ChangeLog
+++ b/media-libs/glut/ChangeLog
@@ -1,6 +1,11 @@
 # 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.23 2006/05/14 23:00:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/ChangeLog,v 1.24 2006/05/16 16:16:56 genstef Exp $
+
+  16 May 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/glut-3.7.1-fix-GLU-linking.patch, +metadata.xml, glut-3.7.1.ebuild:
+  --as-needed-patch thanks to TGL <degrenier@easyconnect.fr> in bug 131837,
+  add metadata, games herd
 
   14 May 2006; Donnie Berkholz <spyderous@gentoo.org>;
   files/digest-glut-3.7-r2, files/digest-glut-3.7.1, Manifest:
diff --git a/media-libs/glut/files/glut-3.7.1-fix-GLU-linking.patch b/media-libs/glut/files/glut-3.7.1-fix-GLU-linking.patch
new file mode 100644
index 000000000000..ec32462a53ed
--- /dev/null
+++ b/media-libs/glut/files/glut-3.7.1-fix-GLU-linking.patch
@@ -0,0 +1,24 @@
+Thanks to TGL <degrenier@easyconnect.fr> in http://bugs.gentoo.org/131837
+
+already in upstream cvs:
+http://webcvs.freedesktop.org/mesa/Mesa-oldtree/src-glut/Makefile.am?r1=1.19&r2=1.20
+
+--- Mesa-5.0/src-glut/Makefile.am.orig	2006-04-30 15:39:32.000000000 +0200
++++ Mesa-5.0/src-glut/Makefile.am	2006-04-30 15:39:47.000000000 +0200
+@@ -9,7 +9,6 @@
+ EXTRA_PROGRAMS = capturexfont
+ 
+ libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@
+-libglut_la_LIBADD = -lGLU
+ libglut_la_SOURCES = \
+ 	glutwin32.h \
+ 	win32_glx.h \
+@@ -67,7 +66,7 @@
+ 	layerutil.h \
+ 	stroke.h
+ 
+-libglut_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD)
++libglut_la_LIBADD = -lGLU $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD)
+ capturexfont_LDFLAGS = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD)
+ 
+ EXTRA_DIST = descript.mms
diff --git a/media-libs/glut/glut-3.7.1.ebuild b/media-libs/glut/glut-3.7.1.ebuild
index 00ac21abc9c1..d607dad5dd38 100644
--- a/media-libs/glut/glut-3.7.1.ebuild
+++ b/media-libs/glut/glut-3.7.1.ebuild
@@ -1,8 +1,8 @@
 # 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.28 2006/05/13 20:19:08 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7.1.ebuild,v 1.29 2006/05/16 16:16:56 genstef Exp $
 
-inherit libtool eutils
+inherit autotools eutils
 
 MESA_VER="5.0"
 DESCRIPTION="The OpenGL Utility Toolkit (GLUT)"
@@ -23,7 +23,8 @@ S="${WORKDIR}/Mesa-${MESA_VER}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	elibtoolize
+	epatch "${FILESDIR}/${P}-fix-GLU-linking.patch"
+	eautoreconf
 }
 
 src_compile() {
diff --git a/media-libs/glut/metadata.xml b/media-libs/glut/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/media-libs/glut/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>