Compile fix by Michael Schreckenbauer, bug #178204

Package-Manager: portage-2.1.3_rc9

4 files changed, 51 insertions, 37 deletions

diff --git a/dev-games/newton/ChangeLog b/dev-games/newton/ChangeLog
index 7d1303127401..872fbd445345 100644
--- a/dev-games/newton/ChangeLog
+++ b/dev-games/newton/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/newton
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/newton/ChangeLog,v 1.2 2007/07/22 09:48:15 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/newton/ChangeLog,v 1.3 2007/07/24 00:22:44 nyhm Exp $
+
+  24 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/newton-1.53-glut.patch, newton-1.53.ebuild:
+  Compile fix by Michael Schreckenbauer, bug #178204
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org> newton-1.53.ebuild:
   Drop virtual/x11 references.
diff --git a/dev-games/newton/Manifest b/dev-games/newton/Manifest
index db000c5aed3d..10a1083cbf65 100644
--- a/dev-games/newton/Manifest
+++ b/dev-games/newton/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX newton-1.53-glut.patch 385 RMD160 3522e9885a902076b75c20729d2eb153e9a50f8b SHA1 c130c4a3696656de0331f2f07ee3b7462b286f6d SHA256 c746ce4bd2d22ca76e41198ab7333b6e5e4d6cc142a16fe7fe9c5c96692a4122
+MD5 52851bf09380e3e751575df4472ca883 files/newton-1.53-glut.patch 385
+RMD160 3522e9885a902076b75c20729d2eb153e9a50f8b files/newton-1.53-glut.patch 385
+SHA256 c746ce4bd2d22ca76e41198ab7333b6e5e4d6cc142a16fe7fe9c5c96692a4122 files/newton-1.53-glut.patch 385
 DIST newtonLinux-1.53.tar.gz 16271012 RMD160 7dfabdd9b4823dfbf0103ec3334bf4c42901d8b0 SHA1 2f833f7152702d46edcf4b5ba179a941effb73ce SHA256 5f7616a4d8fcdc8339f2c799caf1ee98d6e167046d2a05299082d5cc5e130bf6
-EBUILD newton-1.53.ebuild 2016 RMD160 28bda88691e70c54ed3991bd0106420b7b13c9bc SHA1 a6d274caaca56a225a92f22e9f14b9f6b8a99101 SHA256 7244571bee8f10891df943a91d06cc9fd42665a1e578f33243d05c5c6e4168cf
-MD5 043748987730aef529fd838b4f1e5edc newton-1.53.ebuild 2016
-RMD160 28bda88691e70c54ed3991bd0106420b7b13c9bc newton-1.53.ebuild 2016
-SHA256 7244571bee8f10891df943a91d06cc9fd42665a1e578f33243d05c5c6e4168cf newton-1.53.ebuild 2016
-MISC ChangeLog 537 RMD160 ec5bf6640addffe43ee4a6b16534e1b25a401ec4 SHA1 d86ca0b9cb3ef30bb2e77cbc6f23cbbe83607042 SHA256 86bba568c724c6bb397aae1204c8a81045a000e7ef3fc1ae9b6d394bac50c743
-MD5 ba57de548f2dd9b09d992b11d967245a ChangeLog 537
-RMD160 ec5bf6640addffe43ee4a6b16534e1b25a401ec4 ChangeLog 537
-SHA256 86bba568c724c6bb397aae1204c8a81045a000e7ef3fc1ae9b6d394bac50c743 ChangeLog 537
+EBUILD newton-1.53.ebuild 1839 RMD160 b3c47b3bd5bc0fd25ab973baa185bb2e5385c117 SHA1 83432511842495c6647f56d86fe261d431ac948e SHA256 2194df5c1ad69120628cd44b31168721e063f0e096c3a1b71457d08d65c1d0a0
+MD5 6db4eb3a302a5149ecc2b73a7fc5d31e newton-1.53.ebuild 1839
+RMD160 b3c47b3bd5bc0fd25ab973baa185bb2e5385c117 newton-1.53.ebuild 1839
+SHA256 2194df5c1ad69120628cd44b31168721e063f0e096c3a1b71457d08d65c1d0a0 newton-1.53.ebuild 1839
+MISC ChangeLog 690 RMD160 aa264aeb7d6b2175dee4ccac34da580a9cf81610 SHA1 4b4a3945779d32a9ce48ae9c6fd9002d6b805a4b SHA256 9cd9529dad67d05a5b11799ba522709a68031c231896a43dc6275b23d0cfbe0d
+MD5 082091c7177ffc3e6282d028876bea00 ChangeLog 690
+RMD160 aa264aeb7d6b2175dee4ccac34da580a9cf81610 ChangeLog 690
+SHA256 9cd9529dad67d05a5b11799ba522709a68031c231896a43dc6275b23d0cfbe0d ChangeLog 690
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -18,9 +22,9 @@ MD5 096b587c8dfca60539a7c8bcfdb0df50 files/digest-newton-1.53 256
 RMD160 77b75b3d67f623184bc01f809adcb51c722436f4 files/digest-newton-1.53 256
 SHA256 cf3dde7a2d5e46e873e5ace0c382e680ce1f601d938175b78c0a01ff82602b3b files/digest-newton-1.53 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGoyfd0BM77Tkv120RAtyeAJsErvhwIEEKwQlPfgx7tiMGA8dMWQCfXID7
-7jiuizwoa4AYUGkNVa+/QKY=
-=YwUp
+iD8DBQFGpUZXdz7hIScOURERArYlAJ0Zgr58WgGmQwkwYWEFs0xhsRR/gACg6Q5u
+mzf5bs8YXmz8OvM0Zr6/FWU=
+=X5uz
 -----END PGP SIGNATURE-----
diff --git a/dev-games/newton/files/newton-1.53-glut.patch b/dev-games/newton/files/newton-1.53-glut.patch
new file mode 100644
index 000000000000..f1eebc1cec85
--- /dev/null
+++ b/dev-games/newton/files/newton-1.53-glut.patch
@@ -0,0 +1,12 @@
+diff -Naur ../newtonSDK/samples/toolBox/stdafx.h ./samples/toolBox/stdafx.h
+--- ../newtonSDK/samples/toolBox/stdafx.h	2006-04-04 03:02:14.000000000 +0200
++++ ./samples/toolBox/stdafx.h	2007-05-12 15:40:31.000000000 +0200
+@@ -39,7 +39,7 @@
+ 	#ifdef _MIPS_ARCH

+ 		#include <Glut/glut.h>

+ 	#else

+-		#include <glut.h>

++		#include <GL/glut.h>

+ 	#endif

+ 	#include <unistd.h>

+ #endif

diff --git a/dev-games/newton/newton-1.53.ebuild b/dev-games/newton/newton-1.53.ebuild
index e4b43d2e6302..4df5ddfe5c2d 100644
--- a/dev-games/newton/newton-1.53.ebuild
+++ b/dev-games/newton/newton-1.53.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/newton/newton-1.53.ebuild,v 1.2 2007/07/22 09:48:15 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/newton/newton-1.53.ebuild,v 1.3 2007/07/24 00:22:44 nyhm Exp $
+
+inherit eutils
 
 DESCRIPTION="an integrated solution for real time simulation of physics environments"
 HOMEPAGE="http://www.physicsengine.com/"
@@ -12,13 +14,11 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="doc"
 
-RDEPEND="doc? (
-	x11-libs/libXmu
-	x11-libs/libXi
-	virtual/opengl
-	virtual/glut )"
-
-DEPEND="${RDEPEND}"
+DEPEND="doc? (
+		virtual/opengl
+		virtual/glu
+		virtual/glut
+	)"
 
 S=${WORKDIR}/newtonSDK
 
@@ -41,12 +41,11 @@ src_unpack() {
 			tutorial_06_UtilityFuntionality/makefile \
 			tutorial_03_UsingCollisionTree/makefile \
 			|| die "failed fixing sample makefiles"
-		# This is commented out because this thing simply does not compile
-		# with lots of other CFLAGS and I've been unable to determine exactly
-		# what is causing it to fail, but even CFLAGS="-O2" fails.
-#		sed -i \
-#			-e "s:^FLAGS = -g -O0 -c -Wall:FLAGS = ${CFLAGS}:" \
-#			makefile
+		sed -i \
+			-e "/^FLAGS =/s:-g -O0:${CFLAGS}:" \
+			makefile \
+			|| die "sed makefile failed"
+		epatch "${FILESDIR}"/${P}-glut.patch
 	fi
 }
 
@@ -54,27 +53,22 @@ src_compile() {
 	if use doc; then
 		cd samples
 		emake || die "emake samples failed"
+		rm -f */*.elf */*.o
 	fi
 }
 
 src_install() {
-	dolib sdk/libNewton.a
+	dolib.a sdk/libNewton.a || die "dolib.a failed"
 	insinto /usr/include
-	doins sdk/Newton.h
+	doins sdk/Newton.h || die "doins failed"
 
 	if use doc; then
-		find samples -name \*.elf | xargs rm
-		find samples -name \*.o | xargs rm
-
 		insinto /usr/share/${PN}
-		doins -r `ls --ignore=bin samples/*`
+		doins -r samples/* || die "doins samples failed"
 
 		exeinto /usr/share/${PN}/bin
-		dobin samples/bin/tutorial_*
+		doexe samples/bin/tutorial_* || die "doexe failed"
 	fi
 
-	chmod -x doc/*
 	dodoc doc/*
-
-	prepgamesdirs
 }