Added small fixes for bugs 375999 and 381763.

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

5 files changed, 38 insertions, 20 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 9749ab7eb834..f2caa5f6e85e 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.108 2011/09/27 11:21:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.109 2011/11/15 04:05:27 nerdboy Exp $
+
+  15 Nov 2011; Steve Arnold <nerdboy@gentoo.org> grass-6.4.1.ebuild,
+  +files/grass-6.4.1-nopycompile.patch, +files/grass-6.4.1-timer_flags.patch:
+  Added small fixes for bugs 375999 and 381763. Thanks to Chris Mayo for 
+  the second patch. Not addressing other upstream issues at this time.
 
   27 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> grass-6.4.1.ebuild,
   +files/grass-6.4.1-libpng15.patch:
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index c97a6212d21a..a6e05f0add03 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX grass-6.4.0-html-nonviz.patch 1774 RMD160 95f278e851dc782fa89861a60e97f2c6c4da564b SHA1 d917690626b669a9e9455b12bcb1aa14db65c29d SHA256 6da939c90fa851c50895aeb26c54bd9a512e2e7ca14c3da3268e1daa672442ff
 AUX grass-6.4.1-libpng15.patch 906 RMD160 50d1df3a4470f937776ad1f1a30afa757f6423e7 SHA1 79f06b8e62a4e09889cf44289e7b98b361264ef9 SHA256 60135350574b9f2c769cb1513446c6b9fea5f949bc084a9e05d2d81a20ae6d55
+AUX grass-6.4.1-nopycompile.patch 533 RMD160 fd245f604ac1b09476916bd116152afee0e64fcb SHA1 0508368015d74ab425490aa4e643a957c76c4143 SHA256 105c9d69763d961e8b52dd8ecd507bc3e7a853c1fc3feb4591b9e7a62ce44a3e
+AUX grass-6.4.1-timer_flags.patch 337 RMD160 9ea5905fe405ef55cd82a7008e2b64edec4e3bb5 SHA1 6d61aa234bd8b616c407ed79d9afabeaf17dfdd7 SHA256 fe574ff5657b3c4a13e857f9cb182ee89a74db07d3a59e3f2e84c742510f847c
 AUX grass-pkgconf.patch 1322 RMD160 7b48d8e05a07090d8d36d2fb96b385f2d655e066 SHA1 cb33293f442ad0bdd5592f842bcafe13eb021b48 SHA256 2d80c1a3851cd82bdcd7401c537348ec43e488c8b475718727d65ac423a5640c
 DIST grass-6.4.1.tar.gz 23608488 RMD160 2a9ee5da891c9d89a5ad0e66f914d2dd763e5128 SHA1 ea1cdfd1b7422367d671eeaf66f362d694a94abd SHA256 8b886faf8635f77f0d1626806454e6e8bdfa9155e3c10a0bc3e10447b9e6bd03
-EBUILD grass-6.4.1.ebuild 7966 RMD160 7eb936ef73d615dabe3231d3f9de33ec781a5ee7 SHA1 752f9d47245876f0b7a08951ce90b8f83e59c69b SHA256 30c9146a780a8a4ab82dd80713167ba95dd210d776d424eb8641c864aac3018c
-MISC ChangeLog 20938 RMD160 c0f4f0ba139f37ab72aeea84b3038994a9eed920 SHA1 1bfc8798b8bf5420b32b52d12aa5775c05f59378 SHA256 c0369d479494a336e79a301c1093b41720d86488d13b794242e476db9c533b04
+EBUILD grass-6.4.1.ebuild 7916 RMD160 c215ee0028231cbdeeb49a2125f10970b4f05798 SHA1 e348311a483d8430d6935976bbd0925585bc794d SHA256 e89bdef021400cf0ef5a359740946db63197af7b8f57fb179295c7e2ac60ab9c
+MISC ChangeLog 21229 RMD160 564c534142e8260b8ca6ebc654a069959d32d8f2 SHA1 a5711cfda4e3ba3630e09b6b06d9297abf6599c5 SHA256 0268872f51f929b9e4f0685064f52037a1551aee61dc0fd3de58a11728ed7646
 MISC metadata.xml 623 RMD160 f3ab7360eb95e18d25fa0f35bd8817e8628e3246 SHA1 497c577a971010147239a61515ab66a678881569 SHA256 d6200460324878b71cae01dc1193c77749b88b7c2e723041d9f426487c50c85f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQEcBAEBAgAGBQJOgbHUAAoJEEdUh39IaPFN94MH/iOBBuZeFRWh4hQRTCgR7IG5
-Xy2Hz05LWM0IkOqb+QkHO/0kVYge/kodKb16ZeWuHKgA9U6G3xGGlf+l7zM1HRxM
-Yb577VTsOAkkXZILm4jmjuQKGezp8uSsZ4qS62zg4c0DSXF6pxRIYRprm7Bdj+bB
-LBINozr3ohfmz/IPsSO9J/q3qgb66sVsY2Dzg87rYAk6GlTuPi/NPamBYAMgIv09
-RH+sP0OM03n375saf5ksqb+ve0oueO4l6rhQjw69iuzDybpGR4KYlYuH+LfmIU/4
-Iunzy5VmpZhSsGSlynbiwhJzUp1Ehekuujuo1xpslbmvEWOpi5CUSjG7NQSrdm0=
-=FgRa
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch b/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch
new file mode 100644
index 000000000000..75f173aded0c
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch
@@ -0,0 +1,12 @@
+diff -ur grass-6.4.1.orig/gui/wxpython/Makefile grass-6.4.1/gui/wxpython/Makefile
+--- grass-6.4.1.orig/gui/wxpython/Makefile
++++ grass-6.4.1/gui/wxpython/Makefile
+@@ -11,7 +11,7 @@
+ ETCDIR = $(ETC)/wxpython
+ 
+ SRCFILES := $(wildcard compat/* gui_modules/* icons/*.* icons/silk/* images/* xml/*) gis_set.py wxgui.py README
+-DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.pyc,$(filter %.py,$(SRCFILES)))
++DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES))
+ 
+ default: install_scripts
+ 	$(MAKE) parsubdirs
diff --git a/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch b/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch
new file mode 100644
index 000000000000..7c25094728da
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch
@@ -0,0 +1,13 @@
+--- tools/timer/Makefile.orig	2011-11-14 18:58:13.000000000 -0800
++++ tools/timer/Makefile	2011-11-14 19:00:41.000000000 -0800
+@@ -8,8 +8,8 @@
+ default: $(ETC)/$(PGM)
+ 
+ $(ETC)/$(PGM): main.c
+-	$(CC) -c $<
+-	$(CC) -o $(ETC)/$(PGM) $<
++	$(CC) $(CFLAGS) -c $<
++	$(CC) $(LDFLAGS) -o $(ETC)/$(PGM) $<
+ 
+ clean:
+ 	\rm -f $(ETC)/$(PGM) main.o
diff --git a/sci-geosciences/grass/grass-6.4.1.ebuild b/sci-geosciences/grass/grass-6.4.1.ebuild
index 984f83ccd308..1ecf735c2274 100644
--- a/sci-geosciences/grass/grass-6.4.1.ebuild
+++ b/sci-geosciences/grass/grass-6.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.1.ebuild,v 1.8 2011/09/27 11:21:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.1.ebuild,v 1.9 2011/11/15 04:05:27 nerdboy Exp $
 
 EAPI=3
 
@@ -87,6 +87,8 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-pkgconf.patch
 	"${FILESDIR}"/${P}-libpng15.patch
+	"${FILESDIR}"/${P}-nopycompile.patch
+	"${FILESDIR}"/${P}-timer_flags.patch
 )
 
 pkg_setup() {
@@ -124,8 +126,6 @@ pkg_setup() {
 
 src_prepare() {
 	use opengl || epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
-	# Hackish workaround to respect LDFLAGS. Bug #375999
-	sed -i -e "s:-c:${CFLAGS} ${LDFLAGS} &:" "${S}"/tools/timer/Makefile
 	base_src_prepare
 }