Add dep on x11-libs/libXxf86vm, bug #352696, drop old ((19:04) <+scarabeus> grobian: btw when messing with freeglut kill the 2.4.0-r1 too with the commit (less stuff++))

Package-Manager: portage-2.2.01.17689-prefix/cvs/Darwin powerpc

4 files changed, 11 insertions, 74 deletions

diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog
index 578595cf72eb..119c6bd76ebf 100644
--- a/media-libs/freeglut/ChangeLog
+++ b/media-libs/freeglut/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/freeglut
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.75 2010/12/05 14:53:07 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.76 2011/01/26 18:09:59 grobian Exp $
+
+  26 Jan 2011; Fabian Groffen <grobian@gentoo.org> -freeglut-2.4.0-r1.ebuild,
+  freeglut-2.6.0.ebuild:
+  Add dep on x11-libs/libXxf86vm, bug #352696, drop old
 
   05 Dec 2010; Raúl Porcel <armin76@gentoo.org> freeglut-2.6.0.ebuild:
   ia64/sh/sparc stable wrt #325215
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 7b07074656cf..f876a2506a6f 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -3,10 +3,8 @@ AUX 2.6.0-GFX_radeon.patch 786 RMD160 7b7ea37704106af989f36e72b94e8b8e69c6857f S
 AUX freeglut-2.4.0-bsd-usb-joystick.patch 755 RMD160 2453315cc3d2a882bd68d96a413d555e75a0b661 SHA1 095343909d035a9e0933a3af431fc708170db23c SHA256 52ada965b1dc6abbb9ce0bbc00bf91452c6717b74016d21e0a10df24a0ffe83c
 AUX freeglut-2.4.0-macos.patch 384 RMD160 f44ed965ac534697fa5dc4bbc17b1f464795edfd SHA1 4863883e3742162f1ace5767a6c9906e4f7d2f30 SHA256 6de982efac5a62b317e4cc73570da45c4ded0f42295b5dfeae090948d37eabf6
 AUX freeglut-gcc42.patch 283 RMD160 d0fa7fa4828d2ab8e554ce30f72b5af4a92b9e14 SHA1 34cfdaa4f6422af3d5bca097468cb60168581f42 SHA256 e718dc2c6465654c3f87872f459b008109bbacc4c9bcf2a475880ded1b18b436
-DIST freeglut-2.4.0.tar.gz 469557 RMD160 77465647f3d65fbb5cf253eb93ac7409e0c37b14 SHA1 91a528aa72758b7288a0d69a964b1b7e3f322a12 SHA256 269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052
 DIST freeglut-2.6.0-mpx-r6.patch 13696 RMD160 c6a4fa56c512b3e3d4179e00a531e7e90582ec28 SHA1 a2f09fa5fdd0877fb1bbdcbc80f0b7d8ad61df17 SHA256 e2936ce3cb4af219871806004d30f46d7fa9da77f66208203d566bae9e48bb5c
 DIST freeglut-2.6.0.tar.gz 1124186 RMD160 43bdb1a6d99445ee09370930ec6bc0f8310e7fcf SHA1 68306c4486c13d005a4e4d54035e0c0b1bdc220b SHA256 615b41edc96c405ee6bb7e9a2942642140c3e57c1dd8c68e968a17ddfb59e98f
-EBUILD freeglut-2.4.0-r1.ebuild 1727 RMD160 cfa2a93e4e06b2498dacf3cf92d71a76795e17a4 SHA1 ab46be2ea2e926012b56ded3f356b3c1f3cf60e6 SHA256 f385828046406eac65103efdedc74adb1b51fea881cfd12cdad17187fabb8a36
-EBUILD freeglut-2.6.0.ebuild 1501 RMD160 905869ca5e4ec0b46273627f4044d6566f640f0b SHA1 6eab0e998d03b66813fe9d3d8e494a1d3da1af54 SHA256 7e66838402611f4e8cc57921a4cc9dd8dd2c8cd3736bc2beaf9d731f9a9018e7
-MISC ChangeLog 9466 RMD160 e699ed169b22a5d652c6c3932522c55e2773aa96 SHA1 e0d8e1b5f726dc6e41149ef04b9fd9aac3d11454 SHA256 aa3822afbdf3275e24a4ccd9d7e30ceb418fe07e70573d9105e526d788d30e74
+EBUILD freeglut-2.6.0.ebuild 1522 RMD160 4b91c520c476e9aa7feeee0dbd5ec1fda987b165 SHA1 c4d8af9a8d97af19a1e5c0ff70abf01722c683cf SHA256 6a40b31606632019b9a9ff38bbb14edda45404035fc329ce74dc7e3b13722856
+MISC ChangeLog 9626 RMD160 8cb127c4213ae23f15281ebe79c2405e454f6cb3 SHA1 d256afa27cf1f6a6d0cc3b6aab07a2b01a492451 SHA256 ebd6615e9c3bc4f0d37a0cb323b88c7a17d3e2f085aff60a1677f4772424f7a1
 MISC metadata.xml 547 RMD160 aca9d5b8a53da9ad98263a30fafdadb0f97cf368 SHA1 2b890cdc7b0ad39313851f4794e7d04cf360fcd9 SHA256 f20911324f4b6374ced9986fae7cfa7f2bf3041817042a8db923f7e4bcf65b96
diff --git a/media-libs/freeglut/freeglut-2.4.0-r1.ebuild b/media-libs/freeglut/freeglut-2.4.0-r1.ebuild
deleted file mode 100644
index 3c2374353af4..000000000000
--- a/media-libs/freeglut/freeglut-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 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-r1.ebuild,v 1.15 2009/12/14 11:49:26 remi Exp $
-
-inherit eutils flag-o-matic libtool
-
-DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
-HOMEPAGE="http://freeglut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freeglut/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	!media-libs/glut"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	# bug #134586
-	if [[ ${CFLAGS/march/} = ${CFLAGS} ]]; then
-		ewarn "You do not have 'march' set in your CFLAGS."
-		ewarn "This is known to cause compilation problems"
-		ewarn "in ${P}.  If the compile fails, please set"
-		ewarn "'march' to the appropriate architecture."
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fixes bug #97390
-	epatch "${FILESDIR}"/${P}-macos.patch
-
-	# #131856
-	epatch "${FILESDIR}"/${PN}-gcc42.patch
-
-	# (#140542) fix cursor handling so flightgear works
-	epatch "${FILESDIR}"/${PV}-cursor.patch
-
-	# Disable BSD's usb joystick support, see reasons in the patch
-	epatch "${FILESDIR}"/${P}-bsd-usb-joystick.patch
-
-	# bug #134586
-	replace-flags -O3 -O2
-
-	# Needed for sane .so versionning on bsd, please don't drop
-	elibtoolize
-}
-
-src_compile() {
-	# (#191589) Don't let -Werror get tagged on
-	econf --disable-warnings || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	docinto doc
-	dohtml -r doc/*.html doc/*.png
-}
diff --git a/media-libs/freeglut/freeglut-2.6.0.ebuild b/media-libs/freeglut/freeglut-2.6.0.ebuild
index 3bb24b734cb1..f0c9b14d5dd2 100644
--- a/media-libs/freeglut/freeglut-2.6.0.ebuild
+++ b/media-libs/freeglut/freeglut-2.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.6.0.ebuild,v 1.12 2010/12/05 14:53:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.6.0.ebuild,v 1.13 2011/01/26 18:09:59 grobian Exp $
 
 EAPI="2"
 
@@ -20,6 +20,7 @@ RDEPEND="
 	virtual/opengl
 	virtual/glu
 	>=x11-libs/libXi-1.3
+	x11-libs/libXxf86vm
 "
 DEPEND="${RDEPEND}"