--- glui-2.1_beta-r3.ebuild	2005-02-07 00:48:30.000000000 -0800
+++ glui-2.2-r1.ebuild	2005-02-07 11:37:05.946936712 -0800
@@ -1,34 +1,36 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
+
 # Initial ebuild from steven knight <steven.knight@unh.edu>, in bug 23207
 # Updated by Daniel Westermann-Clark <afn41511@afn.org>
+# half-heartedly updated by Colin Macdonald <cbm@sfu.ca>
 
-#inherit libtool eutils
 inherit eutils
 
-# The upstream tarball uses a poor naming convention
+# The upstream tarball uses a different naming convention
 MY_P=${PN}_v${PV/./_}
-MY_PV=${PV/_beta/}
 DESCRIPTION="GLUI is a GLUT-based C++ user interface library"
-SRC_URI="http://www.cs.unc.edu/~rademach/glui/src/release/${MY_P}.tar.gz"
+HOMEPAGE="http://www.nigels.com/glt/glui/"
+SRC_URI="http://www.nigels.com/glt/glui/${MY_P}.tgz"
 
-# Set the source directory, since the upstream tarball uses a poor naming
+# Set the source directory, since the upstream tarball uses a different naming
 # convention
 S=${WORKDIR}/${MY_P}
 
 # This patch is based on:
-# http://http.us.debian.org/debian/pool/main/g/glui/glui_2.1.0.beta-2.diff.gz
+# http://http.us.debian.org/debian/pool/main/g/glui/glui_2.2-1.diff.gz
+# (though that patch creates a Makefile which still refers to version 2.1
 #
 # Removed the Debian-specific files; removed the broken upstream Makefiles;
 # removed the explicit setting of CC, CXX, CFLAGS, CXXFLAGS, and LDFLAGS;
 # and added building of the shared library
-GLUI_DEBIAN_PATCH="glui-2.1_beta-r3-debian.diff"
+GLUI_DEBIAN_PATCH="glui-2.2-r1-debian.diff"
 
 SLOT="0"
 
 LICENSE="LGPL-2"
-KEYWORDS="-* ~x86"
+KEYWORDS="~x86"
 
 DEPEND="virtual/opengl
 	virtual/glut"
@@ -37,6 +39,8 @@
 src_unpack() { 
 	unpack ${A}
 	epatch ${FILESDIR}/${GLUI_DEBIAN_PATCH} || die "epatch failed"
+	rm ${S}/makefile
+	rm ${S}/makefile.bak
 }
 
 src_compile() {
@@ -46,11 +50,12 @@
 src_install() {
 	# This doesn't use einstall, since the Makefile does not have an install
 	# target
-	dolib.a *.a
+	dolib.a lib/libglui.a
 
-	dolib.so libglui.so.${MY_PV}
-	dosym libglui.so.${MY_PV} /usr/lib/libglui.so.${MY_PV/.1/}
-	dosym libglui.so.${MY_PV} /usr/lib/libglui.so
+	dolib.so lib/libglui.so.${PV}
+	# strip minor version (I'm sure there is a better way)
+	dosym libglui.so.${PV} /usr/lib/libglui.so.${PV/.?/}
+	dosym libglui.so.${PV} /usr/lib/libglui.so
 
 	insinto /usr/include/GL
 	doins glui.h
@@ -60,7 +65,7 @@
 
 pkg_postinst() {
 	einfo "To use this library, link using -lglui and include /usr/include/GL/glui.h"
-        einfo
+	einfo
 	einfo "Note: Examples are not included in this release, pending the creation of"
-        einfo "an updated Makefile"
+	einfo "an updated Makefile"
 }