Block media-libs/glut, not ourself :)

Package-Manager: portage-2.1_rc1-r3

4 files changed, 21 insertions, 17 deletions

diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog
index b06c3dc202dd..5f49976aafd1 100644
--- a/media-libs/freeglut/ChangeLog
+++ b/media-libs/freeglut/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/freeglut
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.28 2006/05/20 06:54:06 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.29 2006/05/20 12:15:33 joshuabaergen Exp $
+
+  20 May 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  freeglut-2.2.0.ebuild, freeglut-2.4.0.ebuild:
+  Block media-libs/glut, not ourself :)
 
   20 May 2006; Donnie Berkholz <spyderous@gentoo.org>;
   freeglut-2.2.0.ebuild, freeglut-2.4.0.ebuild:
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 4bd8b67b9517..63d214310bbc 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -4,18 +4,18 @@ RMD160 f44ed965ac534697fa5dc4bbc17b1f464795edfd files/freeglut-2.4.0-macos.patch
 SHA256 6de982efac5a62b317e4cc73570da45c4ded0f42295b5dfeae090948d37eabf6 files/freeglut-2.4.0-macos.patch 384
 DIST freeglut-2.2.0.tar.gz 384055 RMD160 854de841d634074aac0df1cd62c8ca236570419a SHA256 2d8e7329463bcc20a8a14693f1ef3d794a7621dcae37120081b5b0e60149b3ff size 384055
 DIST freeglut-2.4.0.tar.gz 469557 RMD160 77465647f3d65fbb5cf253eb93ac7409e0c37b14 SHA256 269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052 size 469557
-EBUILD freeglut-2.2.0.ebuild 770 RMD160 3788b4fa7c73385f16d84bbd96b6a42bcf3e63f2 SHA1 198c9f9e860eaefb0f637fee20295790be38c6d3 SHA256 7c972c68bf0286782b2a384997fd256222ed5796ac44feae34f48cc0cb5a2690 size 770
-MD5 698e0aba48db772fc3ac3f26c1e20e25 freeglut-2.2.0.ebuild 770
-RMD160 3788b4fa7c73385f16d84bbd96b6a42bcf3e63f2 freeglut-2.2.0.ebuild 770
-SHA256 7c972c68bf0286782b2a384997fd256222ed5796ac44feae34f48cc0cb5a2690 freeglut-2.2.0.ebuild 770
-EBUILD freeglut-2.4.0.ebuild 880 RMD160 4add94b7837b0da0824c20f08c439816d69e3b7b SHA1 c2a6c80f8fe6e0694750a531e312d9f382e5cfb8 SHA256 659ddf9488714e7c8606adc71830e5f6d5c39acaf857038b8a41bedf91d068d6 size 880
-MD5 59daedbbc77212fd535bef0556d91ad2 freeglut-2.4.0.ebuild 880
-RMD160 4add94b7837b0da0824c20f08c439816d69e3b7b freeglut-2.4.0.ebuild 880
-SHA256 659ddf9488714e7c8606adc71830e5f6d5c39acaf857038b8a41bedf91d068d6 freeglut-2.4.0.ebuild 880
-MISC ChangeLog 3386 RMD160 d9a5875b436d0d3d650d9290341c90dadb002121 SHA1 e3ca81f878b955c769f8fdb445845a425477baa7 SHA256 cd86aa754d3d4ccebb578c239c73e9296f1df89cfbad77b7d3a77d9efe55b557 size 3386
-MD5 dfa00c97a69bb3fad0002464e68d3836 ChangeLog 3386
-RMD160 d9a5875b436d0d3d650d9290341c90dadb002121 ChangeLog 3386
-SHA256 cd86aa754d3d4ccebb578c239c73e9296f1df89cfbad77b7d3a77d9efe55b557 ChangeLog 3386
+EBUILD freeglut-2.2.0.ebuild 770 RMD160 cd05bb8ad3148e25336969bd7d40f4a484cf73f2 SHA1 87b48dcb93f6a59ed1bcea7b20397128e786a9c8 SHA256 82903db73200a21af7f7566c1b4c805ecc1005aa8203b638bff1ea091c07331e size 770
+MD5 94ffa4c9aa4297ec3c4051da550c78f5 freeglut-2.2.0.ebuild 770
+RMD160 cd05bb8ad3148e25336969bd7d40f4a484cf73f2 freeglut-2.2.0.ebuild 770
+SHA256 82903db73200a21af7f7566c1b4c805ecc1005aa8203b638bff1ea091c07331e freeglut-2.2.0.ebuild 770
+EBUILD freeglut-2.4.0.ebuild 880 RMD160 7953d7dd63c84e85a10d37fc0a4c947f239ae14b SHA1 cbd7f402b8be91ca4a91579f1ff1f71ddf481a57 SHA256 9c3dca684d24a5b98538233bb6d7ecd937a9425a512b3d18b009251409d6554e size 880
+MD5 a67fd2dcb5f5703fb70da1c2d1ff2314 freeglut-2.4.0.ebuild 880
+RMD160 7953d7dd63c84e85a10d37fc0a4c947f239ae14b freeglut-2.4.0.ebuild 880
+SHA256 9c3dca684d24a5b98538233bb6d7ecd937a9425a512b3d18b009251409d6554e freeglut-2.4.0.ebuild 880
+MISC ChangeLog 3536 RMD160 a059116ba886fa1e3c5b79d49edeeed134d72fec SHA1 8ff64cd37d7f6a450d5b403e206d6e6776c83eab SHA256 98bdca1b2c0e91e9dc8b422a5ed8da0392b9afc58995d9a98ce5f6b35a7082b7 size 3536
+MD5 1493b6b98ea0128916b4452aa60dfd68 ChangeLog 3536
+RMD160 a059116ba886fa1e3c5b79d49edeeed134d72fec ChangeLog 3536
+SHA256 98bdca1b2c0e91e9dc8b422a5ed8da0392b9afc58995d9a98ce5f6b35a7082b7 ChangeLog 3536
 MISC metadata.xml 425 RMD160 dd9c8c1b8a8b5a868c876969bb2645210feb1d5d SHA1 0f759bb1bfa730a503a7fa4dcc0f0824180fa0b2 SHA256 c4f9263d41b15768007178907f7a24bb71eca67f881415d5bf8ccb0f24361948 size 425
 MD5 3c716e18e124f4626bc1170328f70b07 metadata.xml 425
 RMD160 dd9c8c1b8a8b5a868c876969bb2645210feb1d5d metadata.xml 425
diff --git a/media-libs/freeglut/freeglut-2.2.0.ebuild b/media-libs/freeglut/freeglut-2.2.0.ebuild
index c15f743353ea..9e77894345c3 100644
--- a/media-libs/freeglut/freeglut-2.2.0.ebuild
+++ b/media-libs/freeglut/freeglut-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.2.0.ebuild,v 1.23 2006/05/20 06:54:06 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.2.0.ebuild,v 1.24 2006/05/20 12:15:33 joshuabaergen Exp $
 
 DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
 HOMEPAGE="http://freeglut.sourceforge.net/"
@@ -13,7 +13,7 @@ IUSE=""
 
 RDEPEND="virtual/opengl
 	virtual/glu
-	!media-libs/freeglut"
+	!media-libs/glut"
 DEPEND="${RDEPEND}"
 
 src_install() {
diff --git a/media-libs/freeglut/freeglut-2.4.0.ebuild b/media-libs/freeglut/freeglut-2.4.0.ebuild
index ddc34b654171..861d8f8c4c8a 100644
--- a/media-libs/freeglut/freeglut-2.4.0.ebuild
+++ b/media-libs/freeglut/freeglut-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.4.0.ebuild,v 1.7 2006/05/20 06:54:06 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.4.0.ebuild,v 1.8 2006/05/20 12:15:33 joshuabaergen Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND="virtual/opengl
 	virtual/glu
-	!media-libs/freeglut"
+	!media-libs/glut"
 DEPEND="${RDEPEND}"
 
 src_unpack() {