Fix prll compilation

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

5 files changed, 29 insertions, 14 deletions

diff --git a/sci-chemistry/molscript/ChangeLog b/sci-chemistry/molscript/ChangeLog
index 1c0aa5f044b9..b01866c8e2ab 100644
--- a/sci-chemistry/molscript/ChangeLog
+++ b/sci-chemistry/molscript/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/molscript
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/ChangeLog,v 1.12 2010/11/08 17:16:15 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/ChangeLog,v 1.13 2010/11/15 22:44:29 jlec Exp $
+
+  15 Nov 2010; Justin Lecher <jlec@gentoo.org> +files/2.1.2-prll.patch,
+  molscript-2.1.2-r1.ebuild, files/fix-makefile-shared.patch:
+  Fix prll compilation
 
   08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
   -molscript-2.1.2.ebuild, molscript-2.1.2-r1.ebuild:
diff --git a/sci-chemistry/molscript/Manifest b/sci-chemistry/molscript/Manifest
index 57c7e838b6d7..e8a5c20e5bcf 100644
--- a/sci-chemistry/molscript/Manifest
+++ b/sci-chemistry/molscript/Manifest
@@ -2,18 +2,17 @@
 Hash: SHA1
 
 AUX 2.1.2-ldflags.patch 818 RMD160 535c0d9750aa32e206b3cbb365477de6653f0e0d SHA1 39fdeeb7d24a329ebae5f4f96b0e14ccc3e93df5 SHA256 ef1f4079d7b11d69f8f9835266b7bf066fa74623ef2e34c1a5638125153771ab
-AUX fix-makefile-shared.patch 2057 RMD160 3eff611b5265244f24e29fc8e67ab0f0b8289da9 SHA1 323d657db92fad8e2824a18b123a79219745178a SHA256 fe9ee017add68c93e005cb47dbf31c3522a09dfa529858de3538b49c7fbfb51e
+AUX 2.1.2-prll.patch 409 RMD160 ee5815d45c2e93030db071a0110edd80b05fb703 SHA1 8800d2103df5e0c2a3b2562885af4b82b07ed5eb SHA256 23d968365bc5de71d43a9ef6bf2333dc749871b0ada84815f8687a82ca697364
+AUX fix-makefile-shared.patch 2051 RMD160 d8e8a099b8b546bd1c053e8a2b7d5df7b5032a95 SHA1 be36472093520a14312c24c73e651666b539bb14 SHA256 d692b236634d76f3f9d3482d3cc7b05451c0a116ad6edb8ade9075523e6b9bdf
 AUX glutbitmap.h 845 RMD160 e06c28dee5a947cd0716d17ecc487b03294ad980 SHA1 6cb718dba3e394d752f5232d10ba5117b56b1a14 SHA256 ba4caf7c2e7135e80385c2d33d7c780a28f5e9fc3ac557e297f65b70ce925a81
 DIST molscript-2.1.2.tar.gz 412497 RMD160 9539b04c982c8bc855ae368d2743d8db48f15f34 SHA1 4bb4e0c2f1623e9889a3b0fbbc7fa2cd20ac3727 SHA256 01252931f5a3542d5659ddaa4ebceaed2e75becb8ed150dfa14b59da9a63ca01
-EBUILD molscript-2.1.2-r1.ebuild 1467 RMD160 f6ed85db156f38c5288a80ce8cf11a435e7b4a66 SHA1 a96f8e9e0405a36b51f7e2a2bb4e541805d256c1 SHA256 cf22500623fa09d77a2b53334f82a30b79021f67cc3ffc8f7049b34f5ed4dbd4
-MISC ChangeLog 1987 RMD160 88f5b13ba0ccc668f5791ed0be293212656b8aa4 SHA1 5895a510b5234a9e29aeda8f67b6635f244e1057 SHA256 c10ed983cd49b99f72dc2cc2c0ed6f6c1c66bd62d945a806a1e28b58bed41c46
+EBUILD molscript-2.1.2-r1.ebuild 1503 RMD160 67a211259293f5113376ca06e7ad5c57e1046c49 SHA1 6975674cb0b81c852f49aa84a9f113efd5aa9b6f SHA256 fd9d5399e272ed3a841e9c815fa30b906466d23db36bf6e8c75dfc9e66d8e24e
+MISC ChangeLog 2139 RMD160 9c7e08e80b0ac17dd450563e0b37244fb11c6589 SHA1 2d9d7affe316e69335cef5b5e1f58417d2de49a7 SHA256 9d98292414daaede3c449c4e1df7d1081d0496d8ce2bb2f7cd2caa11bf436c4a
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAkzYMGcACgkQIiMqcbOVdxS+zwP+MFAAYMiWj+A+1LN4Oj3KV2r9
-u9D4T361fvt33poRH+C34QeLBWgfAR2w9DDilFXPsbK4oKwVjgIFDBMTscIzCfag
-j6MVtOoSJsU4uzQAEDuf8QEExVUXYQn2pX0XhKmvDGhGXQQrhb5ePS3uQtCNmyo6
-BxYF0burp7F3hd/O5Wk=
-=zwPv
+iEYEARECAAYFAkzht9gACgkQgAnW8HDreRYTFgCgkG8MysGDbLcnTBTYZL2oWMNh
+GAIAn14gLNzNnlgjET+qMrE1E0h8RGKl
+=MRmx
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/molscript/files/2.1.2-prll.patch b/sci-chemistry/molscript/files/2.1.2-prll.patch
new file mode 100644
index 000000000000..e4c972a10533
--- /dev/null
+++ b/sci-chemistry/molscript/files/2.1.2-prll.patch
@@ -0,0 +1,10 @@
+diff --git a/Makefile.complete b/Makefile.complete
+index 92ef20a..e3f68e3 100644
+--- a/Makefile.complete
++++ b/Makefile.complete
+@@ -153,4 +153,4 @@ molauto.o: molauto.c
+ 
+ #------------------------------------------------------------
+ clib/clib.a:
+-	cd clib; make clib.a CFLAGS="-I. $(CFLAGS)" OPENGLCLIBOBJ="$(OPENGLCLIBOBJ)"
++	$(MAKE) -C clib clib.a CFLAGS="-I. $(CFLAGS)" OPENGLCLIBOBJ="$(OPENGLCLIBOBJ)"
diff --git a/sci-chemistry/molscript/files/fix-makefile-shared.patch b/sci-chemistry/molscript/files/fix-makefile-shared.patch
index b718b07bda5d..a9947a61a665 100644
--- a/sci-chemistry/molscript/files/fix-makefile-shared.patch
+++ b/sci-chemistry/molscript/files/fix-makefile-shared.patch
@@ -56,7 +56,7 @@ diff -urN molscript-2.1.2.orig/Makefile.complete molscript-2.1.2/Makefile.comple
  #  Correctness flags:
  #CCHECK = -ansi -fullwarn -g -DSELECT_DEBUG
 -CCHECK = -ansi -fullwarn
-+CCHECK = -ansi -Wall
++CCHECK = -ansi
  #CCHECK = -ansi -fullwarn -DNDEBUG
  
  # General cc compile flags.
diff --git a/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild b/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild
index f6592f9bd59d..967ce690880d 100644
--- a/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild
+++ b/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild,v 1.5 2010/11/08 17:16:15 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild,v 1.6 2010/11/15 22:44:29 jlec Exp $
 
 EAPI="3"
 
@@ -33,15 +33,17 @@ pkg_nofetch() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/fix-makefile-shared.patch
-	epatch "${FILESDIR}"/${PV}-ldflags.patch
+	epatch \
+		"${FILESDIR}"/fix-makefile-shared.patch \
+		"${FILESDIR}"/${PV}-ldflags.patch \
+		"${FILESDIR}"/${PV}-prll.patch
 
 	# Provide glutbitmap.h, because freeglut doesn't have it
 	cp "${FILESDIR}"/glutbitmap.h "${S}"/clib/
 
 	# Stop an incredibly hacky include
 	sed -i -e 's:<../lib/glut/glutbitmap.h>:"glutbitmap.h":g' \
-		"${S}"/clib/ogl_bitmap_character.c
+		"${S}"/clib/ogl_bitmap_character.c || die
 }
 
 src_compile() {