Revision bump to fix a few install bugs. Now installs in /opt/pixie.

6 files changed, 29 insertions, 9 deletions

diff --git a/media-gfx/pixie/ChangeLog b/media-gfx/pixie/ChangeLog
index fd7929a815fd..22163f31a0ee 100644
--- a/media-gfx/pixie/ChangeLog
+++ b/media-gfx/pixie/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for media-gfx/pixie
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.2 2004/04/30 14:04:20 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.3 2004/05/02 01:38:00 eradicator Exp $
 
   30 Apr 2004; David Holm <dholm@gentoo.org> pixie-1.3.5.ebuild:
   Added to ~ppc.
 
+*pixie-1.3.5-r1 (01 May 2004)
+
+  01 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pixie-1.3.5-r1.ebuild, pixie-1.3.5.ebuild, files/50pixie,
+  files/pixie-1.3.5-Makefile.patch:
+  Revision bump to fix a few install bugs.  Now installs in /opt/pixie.
+
 *pixie-1.3.5 (29 Apr 2004)
 
   29 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest
index c16b61d7cd3c..3197edc9fd4c 100644
--- a/media-gfx/pixie/Manifest
+++ b/media-gfx/pixie/Manifest
@@ -1,6 +1,7 @@
-MD5 9e24bb71f4a6d064eee5ebf43aa98a5a ChangeLog 440
+MD5 a31f03eeda0833b0aad8b4031eb294bc pixie-1.3.5-r1.ebuild 1015
+MD5 b190a7f1541bc9d3994a923ab44ba90f ChangeLog 702
 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
-MD5 f1f662649dadbda3e0f0c7cd28a88fa3 pixie-1.3.5.ebuild 855
-MD5 c3ecef6a787c76274c3123507835c714 files/digest-pixie-1.3.5 65
-MD5 a93d1d4b8d9ec771ffaae07d14529876 files/pixie-1.3.5-Makefile.patch 696
+MD5 c3ecef6a787c76274c3123507835c714 files/digest-pixie-1.3.5-r1 65
+MD5 cb8ed959bdd211afc4edb2b0607b5f66 files/50pixie 41
 MD5 30df58c025e459f98cf3aec8548defbb files/pixie-1.3.5-math.patch 992
+MD5 b8cf2dce5fa4e8619c3c3dd4279373b7 files/pixie-1.3.5-Makefile.patch 582
diff --git a/media-gfx/pixie/files/50pixie b/media-gfx/pixie/files/50pixie
new file mode 100644
index 000000000000..56e72e02309d
--- /dev/null
+++ b/media-gfx/pixie/files/50pixie
@@ -0,0 +1,2 @@
+PATH=/opt/pixie/bin
+PIXIEHOME=/opt/pixie
diff --git a/media-gfx/pixie/files/digest-pixie-1.3.5 b/media-gfx/pixie/files/digest-pixie-1.3.5-r1
index fbafc3db7e82..fbafc3db7e82 100644
--- a/media-gfx/pixie/files/digest-pixie-1.3.5
+++ b/media-gfx/pixie/files/digest-pixie-1.3.5-r1
diff --git a/media-gfx/pixie/files/pixie-1.3.5-Makefile.patch b/media-gfx/pixie/files/pixie-1.3.5-Makefile.patch
index 688f9c931a11..19446e92e3f9 100644
--- a/media-gfx/pixie/files/pixie-1.3.5-Makefile.patch
+++ b/media-gfx/pixie/files/pixie-1.3.5-Makefile.patch
@@ -21,6 +21,6 @@
 -
 -
 -
-+	@INSTALL@ -d $(DESTDIR)$(datadir)/doc/pixie && cp -rf $(srcdir)/doc/. $(DESTDIR)$(datadir)/doc/pixie
-+	@INSTALL@ -d $(DESTDIR)$(libdir)/shaders && cp -rf $(srcdir)/shaders/. $(DESTDIR)$(libdir)/shaders
++	cp -rf $(srcdir)/doc $(DESTDIR)$(prefix)
++	cp -rf $(srcdir)/shaders $(DESTDIR)$(prefix)
  
diff --git a/media-gfx/pixie/pixie-1.3.5.ebuild b/media-gfx/pixie/pixie-1.3.5-r1.ebuild
index 55bdbb597500..4b54fe7f0d98 100644
--- a/media-gfx/pixie/pixie-1.3.5.ebuild
+++ b/media-gfx/pixie/pixie-1.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.5.ebuild,v 1.2 2004/04/30 14:04:20 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.5-r1.ebuild,v 1.1 2004/05/02 01:38:00 eradicator Exp $
 
 inherit eutils
 
@@ -31,9 +31,19 @@ src_unpack() {
 	WANT_AUTOMAKE=1.4 automake
 }
 
+src_compile() {
+	./configure --prefix=/opt/pixie || die
+	emake || die
+}
+
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog DEVNOTES NEWS README
 
-	mv ${D}/usr/share/doc/pixie ${D}/usr/share/doc/${PF}/html
+	insinto /etc/env.d
+	doins ${FILESDIR}/50pixie
+
+	edos2unix ${D}/opt/pixie/shaders/*
+
+	mv ${D}/opt/pixie/doc ${D}/usr/share/doc/${PF}/html
 }