Add x11-proto/inputproto dep, bug #205823

Package-Manager: portage-2.1.4

3 files changed, 26 insertions, 25 deletions

diff --git a/media-libs/glut/ChangeLog b/media-libs/glut/ChangeLog
index 97d733968db7..9190eca7357a 100644
--- a/media-libs/glut/ChangeLog
+++ b/media-libs/glut/ChangeLog
@@ -1,6 +1,9 @@
 # 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.27 2006/10/31 19:22:01 nyhm Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/ChangeLog,v 1.28 2008/01/15 09:04:50 nyhm Exp $
+
+  15 Jan 2008; Tristan Heaven <nyhm@gentoo.org> glut-3.7.1.ebuild:
+  Add x11-proto/inputproto dep, bug #205823
 
   31 Oct 2006; Tristan Heaven <nyhm@gentoo.org> glut-3.7.1.ebuild:
   inherit multilib for get_libdir
diff --git a/media-libs/glut/Manifest b/media-libs/glut/Manifest
index eea034090f17..e45100e205ec 100644
--- a/media-libs/glut/Manifest
+++ b/media-libs/glut/Manifest
@@ -11,14 +11,14 @@ RMD160 a394e429098498a79e2bf50659d704264b1e91b1 files/glut-3.7.1-new-autotools.p
 SHA256 40eecb9df5679717bdba1aa1c337000fc63fbd161b0049e2cba7991104927050 files/glut-3.7.1-new-autotools.patch 2656
 DIST MesaDemos-5.0.tar.bz2 894069 RMD160 906e588a67e657f4b3101ad27153d2307827a127 SHA1 b487c94daa2d19060c40b0ae46869c28c883b6e8 SHA256 30fb1b26626efa6bf024c344e369791d41a4bbab9e7d3d9fd926b725a9922a46
 DIST MesaLib-5.0.tar.bz2 1645037 RMD160 e635617811316a4754b3e6945708f5dc1d05524e SHA1 098260c89c4109a8823c76a2c4d75cef8484819d SHA256 0d41fdbeca615901496d135379589b3b547255ede7fc75eeeece7c8979025675
-EBUILD glut-3.7.1.ebuild 1732 RMD160 47ea6111e8b10c7cb0631cc3dae8e130317d650e SHA1 55a8e4108cdd9957ecdb187bbd2b8bb95778e946 SHA256 8de1b1ace9106f705465846dcf38255957f854156ca5e880fcdcf0cf7f25a11b
-MD5 ecb72066d06d0cdad1586f45054298f3 glut-3.7.1.ebuild 1732
-RMD160 47ea6111e8b10c7cb0631cc3dae8e130317d650e glut-3.7.1.ebuild 1732
-SHA256 8de1b1ace9106f705465846dcf38255957f854156ca5e880fcdcf0cf7f25a11b glut-3.7.1.ebuild 1732
-MISC ChangeLog 3786 RMD160 d9a66d49d6aaee78ae39024233f15a9964b24347 SHA1 e378c52799346b6cf8d7c96302bd670fe6d8414e SHA256 213d39e44fcca9b95bd05ab2b3a809a014290833deea8ca9d299128c396e7fc3
-MD5 9c2fe8b4432215ac6da6d7f76f7582da ChangeLog 3786
-RMD160 d9a66d49d6aaee78ae39024233f15a9964b24347 ChangeLog 3786
-SHA256 213d39e44fcca9b95bd05ab2b3a809a014290833deea8ca9d299128c396e7fc3 ChangeLog 3786
+EBUILD glut-3.7.1.ebuild 1699 RMD160 2028630eb56c6746bd4b4311b1baefe1821d0bee SHA1 b4b6e587c3fafc0c0dde223518e48e7e16b5678f SHA256 afffc87341f226521b12e979d17f7665aa634c0b0b69af24f5333ee0bc83c95e
+MD5 6bd9c37a9bbe5f359f026f04e9365264 glut-3.7.1.ebuild 1699
+RMD160 2028630eb56c6746bd4b4311b1baefe1821d0bee glut-3.7.1.ebuild 1699
+SHA256 afffc87341f226521b12e979d17f7665aa634c0b0b69af24f5333ee0bc83c95e glut-3.7.1.ebuild 1699
+MISC ChangeLog 3898 RMD160 8a7930d7377d19f752d133ee831b2ce1074d01ed SHA1 30d3d55fa676831409d0bcde6f21b125e74aad79 SHA256 044a9465494cb2a4e37dd9a5f5486e88761b53592301590266f1a5e32972bfa3
+MD5 faba9ccb76cdba1d449ec6f9e3ed58f4 ChangeLog 3898
+RMD160 8a7930d7377d19f752d133ee831b2ce1074d01ed ChangeLog 3898
+SHA256 044a9465494cb2a4e37dd9a5f5486e88761b53592301590266f1a5e32972bfa3 ChangeLog 3898
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -27,9 +27,9 @@ MD5 a3bd3de99794ec2f9bf65e228042f68a files/digest-glut-3.7.1 485
 RMD160 d4fd1028fc23c4ff4a169f53d67ab91e2584e887 files/digest-glut-3.7.1 485
 SHA256 235b9e4e6628f2171c55cf8867277800f454f94481d9374d4a1cb7d42dc32625 files/digest-glut-3.7.1 485
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFFpzJfdz7hIScOURERAlttAJ9rvNCKWC+r88LU7hZdJHjKAYNE5ACg2tq9
-9mj+JS7T8OuEsYr07PjDq7A=
-=oAfv
+iD8DBQFHjHc4dz7hIScOURERAhbgAKDAmkBtH+sBKwlfimE39LDxxcC3HwCfa2vb
+tvEzUOcJW/zNzT+jRLjSRM0=
+=OnIw
 -----END PGP SIGNATURE-----
diff --git a/media-libs/glut/glut-3.7.1.ebuild b/media-libs/glut/glut-3.7.1.ebuild
index 3d1ae0329949..b30a34c9f78a 100644
--- a/media-libs/glut/glut-3.7.1.ebuild
+++ b/media-libs/glut/glut-3.7.1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 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.32 2006/10/31 19:22:01 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7.1.ebuild,v 1.33 2008/01/15 09:04:50 nyhm Exp $
 
-WANT_AUTOMAKE=latest
-WANT_AUTOCONF=latest
 inherit autotools eutils multilib
 
 MESA_VER="5.0"
@@ -20,9 +18,10 @@ IUSE=""
 RDEPEND="virtual/opengl
 	virtual/glu
 	!media-libs/freeglut"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto"
 
-S="${WORKDIR}/Mesa-${MESA_VER}"
+S=${WORKDIR}/Mesa-${MESA_VER}
 
 src_unpack() {
 	unpack ${A}
@@ -44,19 +43,18 @@ src_compile() {
 	# --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"
+	emake -C src-glut || die "emake failed"
 }
 
 src_install() {
 	insinto /usr/$(get_libdir)
-	newins "${S}"/src-glut/.libs/libglut.lai libglut.la || die "libtools"
+	newins src-glut/.libs/libglut.lai libglut.la || die "libtools"
 
-	dolib.so "${S}"/src-glut/.libs/libglut.so.${PV}
+	dolib.so src-glut/.libs/libglut.so.${PV} || die "dolib.so"
 	dosym libglut.so.${PV} /usr/$(get_libdir)/libglut.so || die "libraries"
 	dosym libglut.so.${PV} /usr/$(get_libdir)/libglut.so.${PV//\.*/} \
 		|| die "libraries"
 
 	insinto /usr/include/GL
-	doins "${S}"/include/GL/glut* || die "headers"
+	doins include/GL/glut* || die "headers"
 }