add patch provided by Paul Bonser <misterpib@gmail.com> in bug193452 to prevent a doubled statement in hipe installation

Package-Manager: portage-2.1.3.9

4 files changed, 42 insertions, 15 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 4799624b7ac5..95e57823aadc 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.76 2007/08/26 07:43:47 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.77 2007/09/23 07:34:43 opfer Exp $
+
+  23 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/erlang-11.2.5-hipe.patch, erlang-11.2.5-r2.ebuild:
+  add patch provided by Paul Bonser <misterpib@gmail.com> in bug193452 to
+  prevent a doubled statement in hipe installation
 
   26 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
   erlang-11.2.5-r2.ebuild:
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index efaf234d6657..d389857fc48c 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -17,6 +17,10 @@ AUX erlang-11.2.5-gethostbyname.patch 755 RMD160 49fc401143ec996cabc7a06c57794ef
 MD5 40674d039d403ee17908fe7a1952f249 files/erlang-11.2.5-gethostbyname.patch 755
 RMD160 49fc401143ec996cabc7a06c57794ef4ca7a662a files/erlang-11.2.5-gethostbyname.patch 755
 SHA256 8746bf418163a2ee3491b18bd57f3a4c8d0bf80008f4470b1aeee67d768afd55 files/erlang-11.2.5-gethostbyname.patch 755
+AUX erlang-11.2.5-hipe.patch 415 RMD160 d9c35d8b1e6872343462b7b08a58c0cab121782f SHA1 7c09a73b80eb15e19fd8fcb9f2f5262439bbfcb4 SHA256 7e0149f7cca79a265f91d4fc850ad088d85bcd94f51706a4fca15a496d5466c9
+MD5 f0ffd3d3ce7c078180882150f0d5cd64 files/erlang-11.2.5-hipe.patch 415
+RMD160 d9c35d8b1e6872343462b7b08a58c0cab121782f files/erlang-11.2.5-hipe.patch 415
+SHA256 7e0149f7cca79a265f91d4fc850ad088d85bcd94f51706a4fca15a496d5466c9 files/erlang-11.2.5-hipe.patch 415
 DIST otp_doc_html_R11B-4.tar.gz 4902864 RMD160 36d8ed3e0523f651f57caa8588f12f0500344f0e SHA1 12f74f4553fa62dcb94d1a89b91551d57d744505 SHA256 fa1f313a0d3f79239ee2930159288419c6c4348d095cf58557ff799712d3a60f
 DIST otp_doc_html_R11B-5.tar.gz 4968176 RMD160 73f8056b66f3bc6ec6b93c3c3dbfdf47074f8974 SHA1 a44439ec924c35896b3cdb534f5001daf6e2e8dd SHA256 7dea67980b958ffebf7a94f3d94bd9c874e041f4f5ee574c56aab62c54a71d28
 DIST otp_doc_man_R11B-4.tar.gz 712928 RMD160 ba006631a99757c65ff4955650485e213d6904b9 SHA1 9b6dda8bd06d869f58cc5f6d83c96e4b6549a7d6 SHA256 5852d7d9b7f09f3dda0261fe51c52025eacbdae258a984994b1a2407a065450e
@@ -31,18 +35,18 @@ EBUILD erlang-11.2.5-r1.ebuild 4650 RMD160 3eb07ec688d1d61bb9c34adcd4c26385d8d20
 MD5 58ca18ba107c39bec1525ea351855813 erlang-11.2.5-r1.ebuild 4650
 RMD160 3eb07ec688d1d61bb9c34adcd4c26385d8d20c3d erlang-11.2.5-r1.ebuild 4650
 SHA256 7a95c2a3945f1aaab038affc24e6c7a89c41c1b1d4967e6bad994944451d8d30 erlang-11.2.5-r1.ebuild 4650
-EBUILD erlang-11.2.5-r2.ebuild 4928 RMD160 24bdfc1943e4edd3cb112242e7b981cacfae67b1 SHA1 e7b83a9bee60b629366c2d919a5a10596a10d20b SHA256 ba8c85149e3d8f9a54ab65b724da0f52ee01796b9cae5c446f3ea7597d68b605
-MD5 e76c0a99ac73003e2226318d3cccf57e erlang-11.2.5-r2.ebuild 4928
-RMD160 24bdfc1943e4edd3cb112242e7b981cacfae67b1 erlang-11.2.5-r2.ebuild 4928
-SHA256 ba8c85149e3d8f9a54ab65b724da0f52ee01796b9cae5c446f3ea7597d68b605 erlang-11.2.5-r2.ebuild 4928
+EBUILD erlang-11.2.5-r2.ebuild 5038 RMD160 a52003f6e83562a36019747fb35b252e6afedfa7 SHA1 55cf168347aa40ad9b405661ec9ab58256206562 SHA256 3c7f05d7a26ba6f44e8b63b09ff0ca07f559d90c4ac3a396270c1db1cb28f2ed
+MD5 a4f1e35ca3ea02f72116b523fa75c763 erlang-11.2.5-r2.ebuild 5038
+RMD160 a52003f6e83562a36019747fb35b252e6afedfa7 erlang-11.2.5-r2.ebuild 5038
+SHA256 3c7f05d7a26ba6f44e8b63b09ff0ca07f559d90c4ac3a396270c1db1cb28f2ed erlang-11.2.5-r2.ebuild 5038
 EBUILD erlang-11.2.5.ebuild 4510 RMD160 64bb640d844ec16d0d5da97e63fcded3577f97a2 SHA1 bd6fa32526e5eb48e00d3c6d027541fd0370cdd9 SHA256 dcc9c292af0ec19539f701decaa64d73380942c093718f112d4d70a31f2ee1cf
 MD5 6ab7bf39f1622ec935636e9b093bc92a erlang-11.2.5.ebuild 4510
 RMD160 64bb640d844ec16d0d5da97e63fcded3577f97a2 erlang-11.2.5.ebuild 4510
 SHA256 dcc9c292af0ec19539f701decaa64d73380942c093718f112d4d70a31f2ee1cf erlang-11.2.5.ebuild 4510
-MISC ChangeLog 14175 RMD160 0257c645fbd754c24709cbd3eb06137a134bdd18 SHA1 861a60604cf7cedb702191d6beb5a5d3f95c8029 SHA256 639de5269742f806ea929c44f85d7f1e35acf7b9d3371880db088273b9d0ff74
-MD5 d7c2d3033a953f9775612c56ee4d7fcb ChangeLog 14175
-RMD160 0257c645fbd754c24709cbd3eb06137a134bdd18 ChangeLog 14175
-SHA256 639de5269742f806ea929c44f85d7f1e35acf7b9d3371880db088273b9d0ff74 ChangeLog 14175
+MISC ChangeLog 14416 RMD160 3823fdb1beb6ece4f6a6964b03f1ac6a121603b2 SHA1 bd77f7c3149bd14882283d2cd50a68539a44fe84 SHA256 4b986363233b73b974bd5720c122c25aa8a343252caad329115cfa2c58908838
+MD5 6fdee2586ed302dfc14a47c85334501f ChangeLog 14416
+RMD160 3823fdb1beb6ece4f6a6964b03f1ac6a121603b2 ChangeLog 14416
+SHA256 4b986363233b73b974bd5720c122c25aa8a343252caad329115cfa2c58908838 ChangeLog 14416
 MISC metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 SHA1 2a45564353e8d0c2b9555294a6a269e56e0b6056 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7
 MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402
 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 metadata.xml 402
@@ -62,7 +66,7 @@ SHA256 ddcd6020ee9b5c4ec63c6532dde43970e1701b576a2c6662bd7177e2c971d3f4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG0S8/NQqtfCuFneMRAtp8AKCb7kteRsppVIA8KneN9iovN8QxZQCfXs3J
-QWmszUkRKHpXSIFZ62Iue/A=
-=F84M
+iD8DBQFG9hcxNQqtfCuFneMRAp1GAJ0TKpR+TR54ow4JL9BdNQeybu7USQCfVn7H
+ZqgNNvGsQF4XEndxo3+KBng=
+=BeWt
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-11.2.5-r2.ebuild b/dev-lang/erlang/erlang-11.2.5-r2.ebuild
index d17a630308cf..8d46d7d5bd78 100644
--- a/dev-lang/erlang/erlang-11.2.5-r2.ebuild
+++ b/dev-lang/erlang/erlang-11.2.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.5-r2.ebuild,v 1.5 2007/08/26 07:43:47 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.5-r2.ebuild,v 1.6 2007/09/23 07:34:43 opfer Exp $
 
 inherit elisp-common eutils flag-o-matic multilib versionator
 
@@ -42,17 +42,23 @@ SITEFILE=50erlang-gentoo.el
 
 src_unpack() {
 	## fix compilation on hardened systems, see bug #154338
-	filter-flags "-fstack-protector"
-	filter-flags "-fstack-protector-all"
+#	filter-flags "-fstack-protector"
+#	filter-flags "-fstack-protector-all"
 
 	unpack ${A}
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-build.patch #184419
+
 	# needed for amd64
 	epatch "${FILESDIR}/${PN}-10.2.6-export-TARGET.patch"
+
 	# needed for FreeBSD
 	epatch "${FILESDIR}/${PN}-11.2.5-gethostbyname.patch"
+
+	# needed for building with hipe and recent coreutils
+	use hipe && epatch "${FILESDIR}"/${P}-hipe.patch
+
 	use odbc || sed -i 's: odbc : :' lib/Makefile
 
 	# make sure we only link ssl dynamically
diff --git a/dev-lang/erlang/files/erlang-11.2.5-hipe.patch b/dev-lang/erlang/files/erlang-11.2.5-hipe.patch
new file mode 100644
index 000000000000..d9399e024d9a
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-11.2.5-hipe.patch
@@ -0,0 +1,12 @@
+Fix duplicate entry in makefile
+
+--- otp_src_R11B-5.orig/lib/hipe/regalloc/Makefile	2007-09-12 12:45:03.000000000 -0600
++++ otp_src_R11B-5/lib/hipe/regalloc/Makefile	2007-09-12 12:46:01.000000000 -0600
+@@ -43,7 +43,6 @@
+ 	  hipe_temp_map \
+ 	  hipe_optimistic_regalloc \
+ 	  hipe_coalescing_regalloc \
+-	  hipe_optimistic_regalloc \
+ 	  hipe_graph_coloring_regalloc \
+ 	  hipe_regalloc_loop \
+ 	  hipe_ls_regalloc \
\ No newline at end of file