From 22167df20a317697e08c355ad3af76bf18d0aaf6 Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Wed, 10 Aug 2005 06:50:08 +0000 Subject: (fd.o #4036) Stop installing glu.h. This and glx.h are already installed by mesa. (Portage version: 2.0.51.22-r2) --- x11-proto/glproto/ChangeLog | 6 +++++- x11-proto/glproto/glproto-1.4.ebuild | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'x11-proto') diff --git a/x11-proto/glproto/ChangeLog b/x11-proto/glproto/ChangeLog index e8f60bced837..d47d78fb26b0 100644 --- a/x11-proto/glproto/ChangeLog +++ b/x11-proto/glproto/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-proto/glproto # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/ChangeLog,v 1.5 2005/08/10 06:40:59 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/ChangeLog,v 1.6 2005/08/10 06:50:08 spyderous Exp $ + + 10 Aug 2005; Donnie Berkholz ; glproto-1.4.ebuild: + (fd.o #4036) Stop installing glu.h. This and glx.h are already installed by + mesa. 10 Aug 2005; Donnie Berkholz ; glproto-1.4.ebuild: Add dep on >=opengl-update-2.2.2. diff --git a/x11-proto/glproto/glproto-1.4.ebuild b/x11-proto/glproto/glproto-1.4.ebuild index 25091469c8b7..80e25409a5ba 100644 --- a/x11-proto/glproto/glproto-1.4.ebuild +++ b/x11-proto/glproto/glproto-1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.ebuild,v 1.5 2005/08/10 06:40:59 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.ebuild,v 1.6 2005/08/10 06:50:08 spyderous Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -36,7 +36,7 @@ dynamic_libgl_install() { local x="" # glext.h added for #54984 # glx.h also provided by mesa, so we don't add it - rm ${D}/usr/include/GL/glx.h + rm ${D}/usr/include/GL/{glx,glu}.h for x in ${D}/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do if [ -f ${x} -o -L ${x} ]; then mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include -- cgit v1.2.3-65-gdbad