summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-proto/glproto/ChangeLog6
-rw-r--r--x11-proto/glproto/Manifest4
-rw-r--r--x11-proto/glproto/glproto-1.4.ebuild4
3 files changed, 9 insertions, 5 deletions
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 <spyderous@gentoo.org>; 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 <spyderous@gentoo.org>; glproto-1.4.ebuild:
Add dep on >=opengl-update-2.2.2.
diff --git a/x11-proto/glproto/Manifest b/x11-proto/glproto/Manifest
index de7be978c2f6..f05549cbe696 100644
--- a/x11-proto/glproto/Manifest
+++ b/x11-proto/glproto/Manifest
@@ -1,3 +1,3 @@
-MD5 86b9eb0d33a95f80347bc57d42cceb2b glproto-1.4.ebuild 1459
-MD5 fa8692ac26abf00d8edfc943e732bc8c ChangeLog 881
+MD5 7ba9cb373b9cde84843645e27b9b1dbd glproto-1.4.ebuild 1465
+MD5 136bb556bee72f8506137cee1de56e57 ChangeLog 1043
MD5 6a9182efc5f985cb40b92436c638034b files/digest-glproto-1.4 63
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