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

(Portage version: 2.1.2_pre2)
 (Unsigned Manifest commit)

3 files changed, 17 insertions, 75 deletions

diff --git a/media-libs/glut/Manifest b/media-libs/glut/Manifest
index 6553db77f173..1bf37a9119f3 100644
--- a/media-libs/glut/Manifest
+++ b/media-libs/glut/Manifest
@@ -1,34 +1,29 @@
-AUX glut-3.7.1-fix-GLU-linking.patch 793 RMD160 031f5f95876ef2a9bed63fd20c08ba20efff3b62 SHA1 1ef65be16e4d6de36f351bab28e3fb5e13d70e1b SHA256 0f2241ebfbff02fd5cf116a39a0d49180f77d72b9c6d8dc880c1fc5ebf03c69e size 793
+AUX glut-3.7.1-fix-GLU-linking.patch 793 RMD160 031f5f95876ef2a9bed63fd20c08ba20efff3b62 SHA1 1ef65be16e4d6de36f351bab28e3fb5e13d70e1b SHA256 0f2241ebfbff02fd5cf116a39a0d49180f77d72b9c6d8dc880c1fc5ebf03c69e
 MD5 131cf67a22642ad25df5dd8971fad6a5 files/glut-3.7.1-fix-GLU-linking.patch 793
 RMD160 031f5f95876ef2a9bed63fd20c08ba20efff3b62 files/glut-3.7.1-fix-GLU-linking.patch 793
 SHA256 0f2241ebfbff02fd5cf116a39a0d49180f77d72b9c6d8dc880c1fc5ebf03c69e files/glut-3.7.1-fix-GLU-linking.patch 793
-AUX glutscript.sh 978 RMD160 a698d827cd21569ac43ccf123a017d50c059e6f9 SHA1 7b52660a694ac2bb0e61318c4c6e155e34c0a634 SHA256 f7f65bce3aa8a17bc00a39cd7735962bd885db06e879396c2b919537d4d3560e size 978
+AUX glut-3.7.1-new-autotools.patch 2656 RMD160 a394e429098498a79e2bf50659d704264b1e91b1 SHA1 a87001405cbaf85a68a9c94430b59f0e89dbd8a1 SHA256 40eecb9df5679717bdba1aa1c337000fc63fbd161b0049e2cba7991104927050
+MD5 30c2746421710a87e02b1115926c2586 files/glut-3.7.1-new-autotools.patch 2656
+RMD160 a394e429098498a79e2bf50659d704264b1e91b1 files/glut-3.7.1-new-autotools.patch 2656
+SHA256 40eecb9df5679717bdba1aa1c337000fc63fbd161b0049e2cba7991104927050 files/glut-3.7.1-new-autotools.patch 2656
+AUX glutscript.sh 978 RMD160 a698d827cd21569ac43ccf123a017d50c059e6f9 SHA1 7b52660a694ac2bb0e61318c4c6e155e34c0a634 SHA256 f7f65bce3aa8a17bc00a39cd7735962bd885db06e879396c2b919537d4d3560e
 MD5 e721299e4a30ba46f1edcd8b8510bcb6 files/glutscript.sh 978
 RMD160 a698d827cd21569ac43ccf123a017d50c059e6f9 files/glutscript.sh 978
 SHA256 f7f65bce3aa8a17bc00a39cd7735962bd885db06e879396c2b919537d4d3560e files/glutscript.sh 978
-DIST MesaDemos-4.0.1.tar.bz2 870767 RMD160 8e11451eb21f56b5455bc51285fb1aafdc112cc9 SHA256 75259cd9347300886381ca22a65bced8b33adf18dfb4767c08dc2931f8a30c35 size 870767
-DIST MesaDemos-5.0.tar.bz2 894069 RMD160 906e588a67e657f4b3101ad27153d2307827a127 SHA256 30fb1b26626efa6bf024c344e369791d41a4bbab9e7d3d9fd926b725a9922a46 size 894069
-DIST MesaLib-4.0.1.tar.bz2 1563232 RMD160 2ca3b7280227d2fd46d32dd4b31ccae9cf6db41e SHA256 867ec35bb3639a0e8eb3c460e34e28ef4466c12d6c8e3a68c408bf5cc53d3d89 size 1563232
-DIST MesaLib-5.0.tar.bz2 1645037 RMD160 e635617811316a4754b3e6945708f5dc1d05524e SHA256 0d41fdbeca615901496d135379589b3b547255ede7fc75eeeece7c8979025675 size 1645037
-EBUILD glut-3.7-r2.ebuild 1244 RMD160 a696ed38b117a48bca5507d8d869b7bb7f5607ee SHA1 263e569f9a967f86d1691cbfeaa494eb34b1461c SHA256 d1060dd1a9529593f47e66ea0a84d637ecf1e809b014755d45f9e811dcb3aef7 size 1244
-MD5 fae408a8495cb90ca9709e4a8eb004e6 glut-3.7-r2.ebuild 1244
-RMD160 a696ed38b117a48bca5507d8d869b7bb7f5607ee glut-3.7-r2.ebuild 1244
-SHA256 d1060dd1a9529593f47e66ea0a84d637ecf1e809b014755d45f9e811dcb3aef7 glut-3.7-r2.ebuild 1244
-EBUILD glut-3.7.1.ebuild 1300 RMD160 59590d2b2b06f5acf3793e4067649070e522df79 SHA1 18b0165c055b5106bca7366a6f2eb808aa06303f SHA256 e377b722a52fc3e3736b9f0faca8a92695400bf2a443cf2317a4968f084e2037 size 1300
-MD5 c66390ef8066d1ed0a8c9eac0da7c83d glut-3.7.1.ebuild 1300
-RMD160 59590d2b2b06f5acf3793e4067649070e522df79 glut-3.7.1.ebuild 1300
-SHA256 e377b722a52fc3e3736b9f0faca8a92695400bf2a443cf2317a4968f084e2037 glut-3.7.1.ebuild 1300
-MISC ChangeLog 3434 RMD160 fe24d75efd5fcd47e7b0c6a25555ad299b88d03f SHA1 b5d0f7b4d978e4654ab3235d3c5706420690bb9b SHA256 321717ec2386f0e80b5d7fd1b0e28dae3a3c5bf0cf81af5bc77893b32e62d967 size 3434
-MD5 775a29ab6c75ea7ae4b39bb8c7992d68 ChangeLog 3434
-RMD160 fe24d75efd5fcd47e7b0c6a25555ad299b88d03f ChangeLog 3434
-SHA256 321717ec2386f0e80b5d7fd1b0e28dae3a3c5bf0cf81af5bc77893b32e62d967 ChangeLog 3434
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+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 1722 RMD160 cc87f4cc93d65fcde59ea0c21d2eeb625d39c637 SHA1 cb2ec6acf09cfb053825cf66fbcab8d3d1bcfddc SHA256 8d6a11642405a235a4a95b87c27cccf468e3be79f9c0fb411d66c19dd0458fd0
+MD5 b6addcdaf59f8a8b8d6b87ee9fa1cb81 glut-3.7.1.ebuild 1722
+RMD160 cc87f4cc93d65fcde59ea0c21d2eeb625d39c637 glut-3.7.1.ebuild 1722
+SHA256 8d6a11642405a235a4a95b87c27cccf468e3be79f9c0fb411d66c19dd0458fd0 glut-3.7.1.ebuild 1722
+MISC ChangeLog 3683 RMD160 d75f8e75bed5a816b9d57e27e540d1fce8c3f0aa SHA1 2e030043c21d4ac2d1f4269803528d7cd978e18f SHA256 43434b2467e9399aa97696495b059beb1ecf3cc69aa233d8ec6c09456a6d8b45
+MD5 41b5d4c81b9edeab3fcda2229e354b6c ChangeLog 3683
+RMD160 d75f8e75bed5a816b9d57e27e540d1fce8c3f0aa ChangeLog 3683
+SHA256 43434b2467e9399aa97696495b059beb1ecf3cc69aa233d8ec6c09456a6d8b45 ChangeLog 3683
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 b353f913ae05d962cbc64a58f4c8cb0b files/digest-glut-3.7-r2 497
-RMD160 cd123061ae3f3f47b7dc125468228a719ed8296e files/digest-glut-3.7-r2 497
-SHA256 9fe3044c01aa1d4b077ab3647fd3f201cd9817674768b9d4fea0c55b369db1e7 files/digest-glut-3.7-r2 497
 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
diff --git a/media-libs/glut/files/digest-glut-3.7-r2 b/media-libs/glut/files/digest-glut-3.7-r2
deleted file mode 100644
index b342d5990a7a..000000000000
--- a/media-libs/glut/files/digest-glut-3.7-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1d7600019f9da28dd65022c024c67dd8 MesaDemos-4.0.1.tar.bz2 870767
-RMD160 8e11451eb21f56b5455bc51285fb1aafdc112cc9 MesaDemos-4.0.1.tar.bz2 870767
-SHA256 75259cd9347300886381ca22a65bced8b33adf18dfb4767c08dc2931f8a30c35 MesaDemos-4.0.1.tar.bz2 870767
-MD5 8b431192f616cfaee12624a74e0bb128 MesaLib-4.0.1.tar.bz2 1563232
-RMD160 2ca3b7280227d2fd46d32dd4b31ccae9cf6db41e MesaLib-4.0.1.tar.bz2 1563232
-SHA256 867ec35bb3639a0e8eb3c460e34e28ef4466c12d6c8e3a68c408bf5cc53d3d89 MesaLib-4.0.1.tar.bz2 1563232
diff --git a/media-libs/glut/glut-3.7-r2.ebuild b/media-libs/glut/glut-3.7-r2.ebuild
deleted file mode 100644
index ba5d88b57720..000000000000
--- a/media-libs/glut/glut-3.7-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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-r2.ebuild,v 1.21 2006/05/20 06:52:50 spyderous Exp $
-
-MESA_VER="4.0.1"
-S=${WORKDIR}/Mesa-${MESA_VER}
-DESCRIPTION="The OpenGL Utility Toolkit (GLUT)"
-SRC_URI="mirror://sourceforge/mesa3d/MesaLib-${MESA_VER}.tar.bz2
-	mirror://sourceforge/mesa3d/MesaDemos-${MESA_VER}.tar.bz2"
-HOMEPAGE="http://www.opengl.org/developers/documentation/glut/"
-
-LICENSE="glut"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	!media-libs/freeglut"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-
-	./configure || die
-
-	cd ${S}/src-glut
-
-	emake || die
-}
-
-src_install() {
-
-	insinto /usr/$(get_libdir)
-	doins ${S}/src-glut/libglut.la
-	dosed -e "s: -L${S}/si-glu : -L/usr/$(get_libdir) :" /usr/$(get_libdir)/libglut.la
-	dosed -e "s:/usr/local/$(get_libdir):/usr/$(get_libdir):g" /usr/$(get_libdir)/libglut.la
-	dosed -e "s:installed=no:installed=yes:" /usr/$(get_libdir)/libglut.la
-
-	dolib.so ${S}/src-glut/.libs/libglut.so.${PV}.0
-	dosym libglut.so.${PV}.0 /usr/$(get_libdir)/libglut.so
-	preplib
-
-	insinto /usr/include/GL
-	doins ${S}/include/GL/glut*
-
-	dodoc ${S}/docs/COPY*
-}