Don't use egamesinstall

Package-Manager: portage-2.1.2-r6

4 files changed, 102 insertions, 33 deletions

diff --git a/games-action/glaxium/ChangeLog b/games-action/glaxium/ChangeLog
index ecd7b9d11985..894788d62a08 100644
--- a/games-action/glaxium/ChangeLog
+++ b/games-action/glaxium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/glaxium
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/ChangeLog,v 1.13 2006/09/26 19:40:46 nyhm Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/ChangeLog,v 1.14 2007/02/03 08:37:22 nyhm Exp $
+
+  03 Feb 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/glaxium-0.5-build.patch, glaxium-0.5.ebuild:
+  Don't use egamesinstall
 
   26 Sep 2006; Tristan Heaven <nyhm@gentoo.org> glaxium-0.5.ebuild:
   Check for nvidia-drivers instead of nvidia-glx, bug #146452
diff --git a/games-action/glaxium/Manifest b/games-action/glaxium/Manifest
index 7f891817a168..09d469bf2d84 100644
--- a/games-action/glaxium/Manifest
+++ b/games-action/glaxium/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.5-rc.patch 277 RMD160 fbbd6975b020d0220a96be5e23d95b6592976acc SHA1 c9863c1bfb18231bc34552c9da910b7f0289f7bd SHA256 a099ebd966a87adba98d6495533e3f2323020b6078e4f09ad66318d96521a815
 MD5 ab479510f01767b032042d1d964670cd files/0.5-rc.patch 277
 RMD160 fbbd6975b020d0220a96be5e23d95b6592976acc files/0.5-rc.patch 277
 SHA256 a099ebd966a87adba98d6495533e3f2323020b6078e4f09ad66318d96521a815 files/0.5-rc.patch 277
+AUX glaxium-0.5-build.patch 1648 RMD160 6817d8bd50abf422f5ad02ec985db00018eb67c9 SHA1 316ea4b494a3b8971e273f8e43871a7e300cb236 SHA256 b6ed7ffc219b9833d8cf9b911eb19cfd9c6a9d93afd21b9aff173c8073578aea
+MD5 7a7880d16227c8e1c5a2173e4832b112 files/glaxium-0.5-build.patch 1648
+RMD160 6817d8bd50abf422f5ad02ec985db00018eb67c9 files/glaxium-0.5-build.patch 1648
+SHA256 b6ed7ffc219b9833d8cf9b911eb19cfd9c6a9d93afd21b9aff173c8073578aea files/glaxium-0.5-build.patch 1648
 AUX glaxium-0.5-gcc41.patch 808 RMD160 1943be88713d73836b32704b27a25473d94dec63 SHA1 97f9fbcfc3f1ca648c3d2e8a45f55e0a8bfefc67 SHA256 9e1ab3e231d583db0a8187dd86c6457ba80eef2ac3c539143229d11d75a86625
 MD5 57c59919852db441f8cdd5a0c38a682f files/glaxium-0.5-gcc41.patch 808
 RMD160 1943be88713d73836b32704b27a25473d94dec63 files/glaxium-0.5-gcc41.patch 808
@@ -11,14 +18,14 @@ MD5 bc74f1b2de241e6004a792b1e18cc457 files/glaxium-0.5-glx.patch 2017
 RMD160 e2e282f57c23de04c30d1d551efc30a937679812 files/glaxium-0.5-glx.patch 2017
 SHA256 e9875901eae693bb62c3fe3871dce796b4a5325131d022e40779cb47bf3a3319 files/glaxium-0.5-glx.patch 2017
 DIST glaxium_0.5.tar.gz 1692219 RMD160 5c988c53d4205ac80e0011a893a80daecf096c1f SHA1 42526a009a377a6fede7b7d343a0cd57c2f8e23e SHA256 78f5a9e1785e9e39f6dcb32134a3bd224372f572f191e7ed77bf50b109afb5f7
-EBUILD glaxium-0.5.ebuild 1248 RMD160 deece4f45acfbed6dab5968b85675390953a52c8 SHA1 78a8aef0cc5d6719b1864aa9739c6b3d6603be0c SHA256 925144414f00a4cc31a0e856512ce1209862f48f027b06a4877d9ddc46d8059f
-MD5 aa1f79d9ecb8906d2b9357cbfd5ffb4c glaxium-0.5.ebuild 1248
-RMD160 deece4f45acfbed6dab5968b85675390953a52c8 glaxium-0.5.ebuild 1248
-SHA256 925144414f00a4cc31a0e856512ce1209862f48f027b06a4877d9ddc46d8059f glaxium-0.5.ebuild 1248
-MISC ChangeLog 1727 RMD160 ab01b54680f66a99b787c503350e24ad9834bd98 SHA1 8e18300f6aecfd40003be27f932075b1e139c357 SHA256 1106f0f35a8b4b88a71ddd117b0e0fe437f431b11072efbd82c769a8a0ec63fd
-MD5 f91f3e5969356d25f8d5fcdcbbf1bb09 ChangeLog 1727
-RMD160 ab01b54680f66a99b787c503350e24ad9834bd98 ChangeLog 1727
-SHA256 1106f0f35a8b4b88a71ddd117b0e0fe437f431b11072efbd82c769a8a0ec63fd ChangeLog 1727
+EBUILD glaxium-0.5.ebuild 1044 RMD160 35fb4db47501d47ea7a9ad151d73ac60e470e692 SHA1 693d33adfe0e520d5b7b7883f0381e776cfae8ec SHA256 78b42f904c243467c196077a280c9d60196a2244867128b823b271946a78b209
+MD5 23a073535c8fac7d12b6515da0651863 glaxium-0.5.ebuild 1044
+RMD160 35fb4db47501d47ea7a9ad151d73ac60e470e692 glaxium-0.5.ebuild 1044
+SHA256 78b42f904c243467c196077a280c9d60196a2244867128b823b271946a78b209 glaxium-0.5.ebuild 1044
+MISC ChangeLog 1856 RMD160 044f53e30ee34f543711ae2c0a7006c568dcd801 SHA1 2934979fd880da6db3a1407fc751be8ef2cf1244 SHA256 ed49d7b36329765b829fed47497859733b98d309148566ef1df126b9d37747f2
+MD5 4c172c9e012b2db452f0f6960f7f9411 ChangeLog 1856
+RMD160 044f53e30ee34f543711ae2c0a7006c568dcd801 ChangeLog 1856
+SHA256 ed49d7b36329765b829fed47497859733b98d309148566ef1df126b9d37747f2 ChangeLog 1856
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -26,3 +33,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 bc92909e8ed1a74fc951d2ce7aedc9f3 files/digest-glaxium-0.5 238
 RMD160 0f80f6f684cb2603fb09e51864cc98e80a081757 files/digest-glaxium-0.5 238
 SHA256 4e59f1b6657fbd4ddec5ef58522bb6c5b37a33657975939d9242020f3313344a files/digest-glaxium-0.5 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFFxEnIdz7hIScOURERAqE4AJ946hLE9x+rG5w+eJlFaJ1UWvUuJQCcCgo1
+qnPLMo0p3vVgQH8kb6D+zns=
+=hzVO
+-----END PGP SIGNATURE-----
diff --git a/games-action/glaxium/files/glaxium-0.5-build.patch b/games-action/glaxium/files/glaxium-0.5-build.patch
new file mode 100644
index 000000000000..f7c7899e2a89
--- /dev/null
+++ b/games-action/glaxium/files/glaxium-0.5-build.patch
@@ -0,0 +1,60 @@
+--- configure.in
++++ configure.in
+@@ -41,7 +41,7 @@
+ AC_EGREP_HEADER(PFNGLBINDPROGRAMNVPROC, GL/glext.h,  ,echo "Glaxium won't compile: get a newer version of your openGL header GL/glext.h at <http://oss.sgi.com/projects/ogl-sample/registry/>";exit 12)
+ 
+ dnl Expand DATADIR
+-FC_EXPAND_DIR(DATADIR, "$datadir/games/glaxium")
++FC_EXPAND_DIR(DATADIR, "$datadir/glaxium")
+ AC_DEFINE_UNQUOTED(DATADIR, "$DATADIR")
+ 
+ AC_OUTPUT(Makefile)
+--- Makefile.in
++++ Makefile.in
+@@ -1,5 +1,5 @@
+ 
+-CC=@CXX@
++CXX=@CXX@
+ INCLUDE=@CFLAGS@ @CPPFLAGS@
+ LIB=@LIBS@
+ 
+@@ -15,11 +15,11 @@
+ 
+ GLAXIUM_INSTALLDIR=$(bindir)
+ DATA_DIRS=samples textures
+-GLAXIUM_HOME=$(datadir)/games/glaxium
++GLAXIUM_HOME=$(datadir)/glaxium
+ MAN_DIR=$(mandir)
+ 
+ glaxium : $(OBJ)
+-	gcc -g -o glaxium $(OBJ) $(LIB)
++	$(CXX) -o glaxium $(OBJ) $(LIB) $(LDFLAGS)
+ 
+ 
+ 
+@@ -31,18 +31,17 @@
+ 
+ 
+ %.o : %.cpp
+-	$(CC) -c  $(INCLUDE) $< -o $@ -DDATADIR=\"$(GLAXIUM_HOME)\"
++	$(CXX) -c  $(INCLUDE) $< -o $@ -DDATADIR=\"$(GLAXIUM_HOME)\"
+ 
+ 
+ install: glaxium
+ 	@echo Instaling glaxium in $(GLAXIUM_INSTALLDIR) and its data in $(GLAXIUM_HOME)
+-	@if [ ! -d $(GLAXIUM_HOME) ] ; then \
+-		mkdir -p $(GLAXIUM_HOME) ; \
+-	fi
+-	@cp -f glaxium $(GLAXIUM_INSTALLDIR)/
+-	@cp -R $(DATA_DIRS) $(GLAXIUM_HOME)
+-	@mkdir -p $(MAN_DIR)/man6/
+-	@cp -f glaxium.6 $(MAN_DIR)/man6/glaxium.6 
++	mkdir -p "$(DESTDIR)$(GLAXIUM_INSTALLDIR)"
++	@cp -f glaxium "$(DESTDIR)$(GLAXIUM_INSTALLDIR)"/
++	mkdir -p "$(DESTDIR)$(GLAXIUM_HOME)"	
++	@cp -R $(DATA_DIRS) "$(DESTDIR)$(GLAXIUM_HOME)"
++	@mkdir -p "$(DESTDIR)$(MAN_DIR)"/man6/
++	@cp -f glaxium.6 "$(DESTDIR)$(MAN_DIR)"/man6/glaxium.6
+ 
+ uninstall: 
+ 	@echo Uninstaling glaxium
diff --git a/games-action/glaxium/glaxium-0.5.ebuild b/games-action/glaxium/glaxium-0.5.ebuild
index acec731e0c3c..6da846da7432 100644
--- a/games-action/glaxium/glaxium-0.5.ebuild
+++ b/games-action/glaxium/glaxium-0.5.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/glaxium-0.5.ebuild,v 1.15 2006/09/26 19:40:46 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/glaxium-0.5.ebuild,v 1.16 2007/02/03 08:37:22 nyhm Exp $
 
-inherit eutils flag-o-matic toolchain-funcs games
+inherit autotools eutils games
 
 DESCRIPTION="OpenGL-based space-ship shoot-em-up style game"
 HOMEPAGE="http://xhosxe.free.fr/glaxium/"
-SRC_URI="http://xhosxe.free.fr/glaxium/glaxium_${PV}.tar.gz"
+SRC_URI="http://xhosxe.free.fr/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.1.5
-	>=media-libs/sdl-mixer-1.2.4
-	x11-libs/libXmu
-	x11-libs/libXi
+DEPEND="media-libs/libsdl
+	media-libs/sdl-mixer
 	virtual/opengl
 	virtual/glu
 	virtual/glut
-	>=media-libs/libpng-1.0.0"
+	media-libs/libpng"
 
 S=${WORKDIR}/${PN}_${PV}
 
@@ -30,24 +28,17 @@ src_unpack() {
 	if has_version x11-drivers/nvidia-legacy-drivers || \
 		has_version x11-drivers/nvidia-drivers
 	then
-		epatch "${FILESDIR}/${P}-glx.patch"
+		epatch "${FILESDIR}"/${P}-glx.patch
 	fi
-	epatch "${FILESDIR}/${PV}-rc.patch" \
-		"${FILESDIR}/${P}-gcc41.patch"
-}
-
-src_compile() {
-	egamesconf \
-		--datadir="${GAMES_DATADIR_BASE}" || die
-	emake || die "emake failed"
+	epatch \
+		"${FILESDIR}"/${PV}-rc.patch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-build.patch
+	eautoreconf
 }
 
 src_install() {
-	dodir "${GAMES_BINDIR}"
-	egamesinstall \
-		exec_prefix="${D}/${GAMES_PREFIX}" \
-		datadir="${D}/${GAMES_DATADIR_BASE}" \
-		|| die
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc README.txt CHANGES.txt
 	prepgamesdirs
 }