5 files changed, 165 insertions, 10 deletions
diff --git a/dev-lang/sr/ChangeLog b/dev-lang/sr/ChangeLog
index 1b0428ba2b46..4fba35c3c988 100644
--- a/dev-lang/sr/ChangeLog
+++ b/dev-lang/sr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/sr
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/sr/ChangeLog,v 1.8 2009/12/23 10:17:00 dev-zero Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/sr/ChangeLog,v 1.9 2010/08/10 15:04:25 xarthisius Exp $
+
+  10 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> sr-2.3.3.ebuild,
+  +files/sr-2.3.3-ldflags.patch, +files/sr-2.3.3-parallel_build.patch:
+  Respect LDFLAGS wrt bug 322013. Thanks to Diego for report. Fix parallel
+  build.
 
   23 Dec 2009; Tiziano Müller <dev-zero@gentoo.org> sr-2.3.3.ebuild:
   Added blocker for app-misc/srm (bug #247402).
diff --git a/dev-lang/sr/Manifest b/dev-lang/sr/Manifest
index 2511023ab50f..9d3b1c4b6d0a 100644
--- a/dev-lang/sr/Manifest
+++ b/dev-lang/sr/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX sr-2.3.3-ldflags.patch 1754 RMD160 b42f676179e671203c16bd11c78e6ff0bd59881d SHA1 e62c14564a5ea7a68e900b5845c636b404cf2cde SHA256 c9e129cad5b899ba3090f578746fcbe23843fe8e5dece78157d0403dd218b937
+AUX sr-2.3.3-parallel_build.patch 1024 RMD160 7b42ede76dffb71fbf652d55511a89baeb74acd8 SHA1 153ec0194820642d16bf5c81b551661aef5e0a29 SHA256 ce189ae29bb0d18ea5228780b2be00fabb273bcb0627af8227fced97bf551e5a
 DIST sr233.tar.Z 1424566 RMD160 58c90c06abede7a15ca8a68f53b6fdfa575c79df SHA1 0354987527ed1e84c32d3b1fc6bacb65d647f337 SHA256 2496a2800dbe6790977b251c1e5b70b3661f2d943e8ad1973820b0f0a98939ed
-EBUILD sr-2.3.3.ebuild 1658 RMD160 14c7ddc385884f9e0af8b5e9061e94445995e404 SHA1 981a422b6f60c7c363c4135329e0d04968813a4a SHA256 455f5faab557e352ef5f289a328a16b37004706953036325e8418a55f8c876ee
-MISC ChangeLog 1719 RMD160 e0d82c1796181368727c9716b1376dbc1bcbfaa3 SHA1 a1365ed2a30743874dc87982ecf33386eaff8bb6 SHA256 8ed6d8d3926b0a010d3e7dfdcd03ac0ede2e034dd55d6bfd89f3e8414b361661
+EBUILD sr-2.3.3.ebuild 1774 RMD160 f393186b130f35242b0b422bf80f1bfe278b869c SHA1 c346ccbc0960f09343c62178c4589f0320e84483 SHA256 d76990e547acdad68b7f3986c43cf24374bd9a362ab3f5b535a09a22f1d03487
+MISC ChangeLog 1948 RMD160 d04616629cd3fe4bdbc5c3424c67fde8be54d194 SHA1 1534b1bf923363f6785d0dc02dc62feef36ea9ae SHA256 d241b37595ed27e99d9b4b702d4a86dd852f69c9903aa06efc137ccf8129ee04
 MISC metadata.xml 163 RMD160 41471f7b1ab9acbf6cc2795892c58620eed62e2d SHA1 8cb098988404ac2b619cd1f93780ea87213f2338 SHA256 990e80782b8e674ebf8a90a773ced22829dea63f938c50c68aff7ee4d898c857
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkxhaoIACgkQIiMqcbOVdxSa5QP+OXlw0+S8Q63h17ZZyiWZNGfl
+EIiFXM+NxAjMVNvuZC3eLYgu+k0YnI+jecSGvT/5MNymljWJw7ohr2p4EM8hWXWt
+gEkVHVoPsACKAj9Prn22wMGnRfnBm9SCjdA7hSo3o93d7FrOm1h3VgoaRA0IEDTQ
+gogF31uPYbpSdUFcZY8=
+=rJpA
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/sr/files/sr-2.3.3-ldflags.patch b/dev-lang/sr/files/sr-2.3.3-ldflags.patch
new file mode 100644
index 000000000000..0dba2fee4842
--- /dev/null
+++ b/dev-lang/sr/files/sr-2.3.3-ldflags.patch
@@ -0,0 +1,81 @@
+Respect LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=332013
+
+--- srtex/Makefile
++++ srtex/Makefile
+@@ -11,7 +11,7 @@
+ 
+ 
+ srtex:$& $(OBJ)
+-	. ../paths.sh; $(CC) $(CFLAGS) -o srtex $(OBJ) $$LIBC
++	. ../paths.sh; $(CC) $(LDFLAGS) $(CFLAGS) -o srtex $(OBJ) $$LIBC
+ 
+ lex.yy.c: scan.l
+ 	lex scan.l
+--- srlatex/Makefile
++++ srlatex/Makefile
+@@ -6,7 +6,7 @@
+ OBJ = print.o lex.yy.o
+ 
+ srlatex:$& $(OBJ)
+-	. ../paths.sh; $(CC) $(CFLAGS) -o srlatex $(OBJ) $$LIBC
++	. ../paths.sh; $(CC) $(LDFLAGS) $(CFLAGS) -o srlatex $(OBJ) $$LIBC
+ 
+ lex.yy.c: scan.l
+ 	lex scan.l
+--- srl/Makefile
++++ srl/Makefile
+@@ -13,7 +13,7 @@
+ 
+ 
+ srl:$&	$(OBJ)
+-	. ../paths.sh; $(CC) $(CFLAGS) -o srl $(OBJ) $$LIBC
++	. ../paths.sh; $(CC) $(LDFLAGS) $(CFLAGS) -o srl $(OBJ) $$LIBC
+ 
+ 
+ tar:
+--- srm/Makefile
++++ srm/Makefile
+@@ -15,7 +15,7 @@
+ 
+ 
+ srm:$&	$(OBJ)
+-	. ../paths.sh; $(CC) $(CFLAGS) -o srm $(OBJ) $$LIBC
++	. ../paths.sh; $(CC) $(LDFLAGS) $(CFLAGS) -o srm $(OBJ) $$LIBC
+ 
+ 
+ 
+--- sr/Makefile
++++ sr/Makefile
+@@ -42,7 +42,7 @@
+ 
+ 
+ sr:$&	$(OBJ) $(UTIL)
+-	. ../paths.sh; $(CC) $(CFLAGS) -o sr $(OBJ) $$LIBM $$LIBC
++	. ../paths.sh; $(CC) $(LDFLAGS) $(CFLAGS) -o sr $(OBJ) $$LIBM $$LIBC
+ 
+ tokens.c: tokens.l
+ 	lex tokens.l
+--- srprof/Makefile
++++ srprof/Makefile
+@@ -7,7 +7,7 @@
+ 
+ 
+ srprof:$& $(OBJ)
+-	. ../paths.sh; $(CC) $(CFLAGS) -o srprof $(OBJ) $$LIBC
++	. ../paths.sh; $(CC) $(LDFLAGS) $(CFLAGS) -o srprof $(OBJ) $$LIBC
+ 
+ 
+ clean:
+--- rts/Makefile
++++ rts/Makefile
+@@ -36,7 +36,7 @@
+ 
+ 
+ srx:	$(XOBJ)
+-	. ../paths.sh; $(CC) $(CFLAGS) -o srx $(XOBJ) $$LIBC
++	. ../paths.sh; $(CC) $(LDFLAGS) $(CFLAGS) -o srx $(XOBJ) $$LIBC
+ 
+ # defining SRX disables MultiSR to build the single threaded versions srx needs
+ # (dependencies on .o files force rebuild when .h files change)
diff --git a/dev-lang/sr/files/sr-2.3.3-parallel_build.patch b/dev-lang/sr/files/sr-2.3.3-parallel_build.patch
new file mode 100644
index 000000000000..5b1173f829d3
--- /dev/null
+++ b/dev-lang/sr/files/sr-2.3.3-parallel_build.patch
@@ -0,0 +1,54 @@
+--- Makefile
++++ Makefile
+@@ -20,19 +20,19 @@
+ ##  Build the entire system.
+ 
+ all:	config
+-	cd sr;		$(RMAKE)
+-	cd srl;		$(RMAKE)
+-	cd csw;		$(RMAKE)
+-	cd rts;		$(RMAKE)
+-	cd library;	$(RMAKE)
+-	cd srm;		$(RMAKE)
+-	cd srprof;	$(RMAKE)
+-	cd srgrind;	$(RMAKE)
+-	cd srtex;	$(RMAKE)
+-	cd srlatex;	$(RMAKE)
+-	cd preproc;	$(RMAKE)
+-	cd srv;		$(RMAKE)	
+-	cd links;	$(RMAKE)
++	+$(RMAKE) -C sr
++	+$(RMAKE) -C srl
++	+$(RMAKE) -C csw
++	+$(RMAKE) -C rts
++	+$(RMAKE) -C library
++	+$(RMAKE) -C srm
++	+$(RMAKE) -C srprof
++	+$(RMAKE) -C srgrind
++	+$(RMAKE) -C srtex
++	+$(RMAKE) -C srlatex
++	+$(RMAKE) -C preproc
++	+$(RMAKE) -C srv
++	+$(RMAKE) -C links
+ 
+ 
+ 
+--- sr/Makefile
++++ sr/Makefile
+@@ -48,10 +48,14 @@
+ 	lex tokens.l
+ 	mv lex.yy.c tokens.c
+ 
+-grammar.c tokens.h: grammar.y
++y.tab.c: y.tab.h
++y.tab.h: grammar.y
+ 	@echo ...expect 4 shift/reduce conflicts:
+-	$(YACC) $(YFLAGS) -d grammar.y 
++	$(YACC) $(YFLAGS) -d grammar.y
++
++grammar.c: y.tab.c
+ 	mv y.tab.c grammar.c
++tokens.h: y.tab.h
+ 	mv y.tab.h tokens.h
+ 
+ tkflags.h: grammar.y
diff --git a/dev-lang/sr/sr-2.3.3.ebuild b/dev-lang/sr/sr-2.3.3.ebuild
index 261d0ebf6817..603bfa50eae8 100644
--- a/dev-lang/sr/sr-2.3.3.ebuild
+++ b/dev-lang/sr/sr-2.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/sr/sr-2.3.3.ebuild,v 1.5 2009/12/23 10:17:00 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/sr/sr-2.3.3.ebuild,v 1.6 2010/08/10 15:04:25 xarthisius Exp $
 
-inherit eutils versionator
+inherit eutils versionator toolchain-funcs
 
 MY_PV=$(delete_all_version_separators)
 DESCRIPTION="SR (Synchronizing Resources) is a language for writing concurrent programs"
@@ -21,8 +21,9 @@ S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	#epatch ${FILESDIR}/${P}.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-parallel_build.patch
 	sed -i -e "s:SRSRC = /usr/local/src/sr:SRSRC = ${S}:" \
 		-e "s:/usr/local:/usr:" -e "s:/usr/X11/lib:/usr/lib:" \
 		-e "s:CCPATH = /bin/cc:CCPATH = /usr/bin/gcc:" \
@@ -32,7 +33,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake || die "make failed"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
 }
 
 src_test() {