version bump

(Portage version: 2.2.0_alpha118/cvs/Linux i686)

4 files changed, 23 insertions, 5 deletions

diff --git a/dev-lang/libcilkrts/ChangeLog b/dev-lang/libcilkrts/ChangeLog
index 93aa9f88b19f..7a6284fce503 100644
--- a/dev-lang/libcilkrts/ChangeLog
+++ b/dev-lang/libcilkrts/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for dev-lang/libcilkrts
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/libcilkrts/ChangeLog,v 1.1 2012/06/14 19:38:03 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/libcilkrts/ChangeLog,v 1.2 2012/07/18 02:23:48 ottxor Exp $
+
+*libcilkrts-2546 (18 Jul 2012)
+
+  18 Jul 2012; Christoph Junghans <ottxor@gentoo.org>
+  +files/libcilkrts-2546-build.patch, +files/libcilkrts-2546-include.patch,
+  +libcilkrts-2546.ebuild, -files/libcilkrts-1857-include.patch,
+  -libcilkrts-1857.ebuild:
+  version bump
 
 *libcilkrts-1857 (14 Jun 2012)
 
   14 Jun 2012; Christoph Junghans <ottxor@gentoo.org> +libcilkrts-1857.ebuild,
   +files/libcilkrts-1857-include.patch, +metadata.xml:
   initial commit
-
diff --git a/dev-lang/libcilkrts/files/libcilkrts-2546-build.patch b/dev-lang/libcilkrts/files/libcilkrts-2546-build.patch
new file mode 100644
index 000000000000..df77a17a605f
--- /dev/null
+++ b/dev-lang/libcilkrts/files/libcilkrts-2546-build.patch
@@ -0,0 +1,11 @@
+diff -Naur libcilkrts.orig/Makefile.am libcilkrts/Makefile.am
+--- libcilkrts.orig/Makefile.am	2012-07-17 20:13:45.000000000 -0600
++++ libcilkrts/Makefile.am	2012-07-17 20:13:55.000000000 -0600
+@@ -29,7 +29,6 @@
+ # POSSIBILITY OF SUCH DAMAGE.
+ 
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ..
+ 
+ # Compiler and linker flags.
+ GENERAL_FLAGS = -I$(top_srcdir)/include -DIN_CILK_RUNTIME=1
diff --git a/dev-lang/libcilkrts/files/libcilkrts-1857-include.patch b/dev-lang/libcilkrts/files/libcilkrts-2546-include.patch
index a9bf023e912b..a9bf023e912b 100644
--- a/dev-lang/libcilkrts/files/libcilkrts-1857-include.patch
+++ b/dev-lang/libcilkrts/files/libcilkrts-2546-include.patch
diff --git a/dev-lang/libcilkrts/libcilkrts-1857.ebuild b/dev-lang/libcilkrts/libcilkrts-2546.ebuild
index 565f299f1d5d..d6fb184a0fc9 100644
--- a/dev-lang/libcilkrts/libcilkrts-1857.ebuild
+++ b/dev-lang/libcilkrts/libcilkrts-2546.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/libcilkrts/libcilkrts-1857.ebuild,v 1.1 2012/06/14 19:38:03 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/libcilkrts/libcilkrts-2546.ebuild,v 1.1 2012/07/18 02:23:48 ottxor Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit autotools-utils
 
 DESCRIPTION="Intel Cilk Plus run time library"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-cilk-plus/"
-SRC_URI="http://software.intel.com/file/38088 -> cilkplus-rtl-001857.tgz"
+SRC_URI="http://software.intel.com/file/44474 -> cilkplus-rtl-00${PV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,4 +24,4 @@ AUTOTOOLS_AUTORECONF=1
 
 DOCS=( README )
 
-PATCHES=( "${FILESDIR}/${P}-include.patch" )
+PATCHES=( "${FILESDIR}/${P}-build.patch" "${FILESDIR}/${P}-include.patch" )