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++))

(Portage version: 2.2.01.17689-prefix/cvs/Darwin powerpc)

3 files changed, 9 insertions, 70 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/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}"