version bump

(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key C2000586)

4 files changed, 34 insertions, 20 deletions

diff --git a/dev-lang/libcilkrts/ChangeLog b/dev-lang/libcilkrts/ChangeLog
index 7a6284fce503..7cabefe69d45 100644
--- a/dev-lang/libcilkrts/ChangeLog
+++ b/dev-lang/libcilkrts/ChangeLog
@@ -1,6 +1,13 @@
 # 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.2 2012/07/18 02:23:48 ottxor Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/libcilkrts/ChangeLog,v 1.3 2013/01/14 04:41:37 ottxor Exp $
+
+*libcilkrts-2856 (14 Jan 2013)
+
+  14 Jan 2013; Christoph Junghans <ottxor@gentoo.org>
+  +files/libcilkrts-2856-flags.patch, +libcilkrts-2856.ebuild,
+  -files/libcilkrts-2546-build.patch, -libcilkrts-2546.ebuild:
+  version bump
 
 *libcilkrts-2546 (18 Jul 2012)
 
diff --git a/dev-lang/libcilkrts/files/libcilkrts-2546-build.patch b/dev-lang/libcilkrts/files/libcilkrts-2546-build.patch
deleted file mode 100644
index df77a17a605f..000000000000
--- a/dev-lang/libcilkrts/files/libcilkrts-2546-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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-2856-flags.patch b/dev-lang/libcilkrts/files/libcilkrts-2856-flags.patch
new file mode 100644
index 000000000000..304d8e82372a
--- /dev/null
+++ b/dev-lang/libcilkrts/files/libcilkrts-2856-flags.patch
@@ -0,0 +1,18 @@
+diff -Naur libcilkrts.orig/Makefile.am libcilkrts/Makefile.am
+--- libcilkrts.orig/Makefile.am	2013-01-13 21:32:38.477690223 -0700
++++ libcilkrts/Makefile.am	2013-01-13 21:33:08.697795224 -0700
+@@ -38,12 +38,12 @@
+ 
+ # Compiler and linker flags.
+ GENERAL_FLAGS = -I$(top_srcdir)/include -DIN_CILK_RUNTIME=1
+-GENERAL_FLAGS += -fpic -O3
++GENERAL_FLAGS += -fpic
+ GENERAL_FLAGS += -DBUILD_USER=\"$(USER)\"
+ GENERAL_FLAGS += -DBUILD_HOST=\"`hostname`\"
+ 
+ # Enable Intel Cilk Plus extension
+-GENERAL_FLAGS += -fcilkplus
++#GENERAL_FLAGS += -fcilkplus
+ 
+ AM_CFLAGS = $(GENERAL_FLAGS) -std=c99
+ AM_CPPFLAGS = $(GENERAL_FLAGS)
diff --git a/dev-lang/libcilkrts/libcilkrts-2546.ebuild b/dev-lang/libcilkrts/libcilkrts-2856.ebuild
index d6fb184a0fc9..a4f81eff29b6 100644
--- a/dev-lang/libcilkrts/libcilkrts-2546.ebuild
+++ b/dev-lang/libcilkrts/libcilkrts-2856.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/libcilkrts/libcilkrts-2546.ebuild,v 1.1 2012/07/18 02:23:48 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/libcilkrts/libcilkrts-2856.ebuild,v 1.1 2013/01/14 04:41:37 ottxor Exp $
 
-EAPI=4
+EAPI=5
 
 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/44474 -> cilkplus-rtl-00${PV}.tgz"
+HOMEPAGE="http://cilkplus.org"
+SRC_URI="http://cilkplus.org/sites/default/files/runtime_source/cilkplus-rtl-00${PV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
 DEPEND=""
@@ -24,4 +24,4 @@ AUTOTOOLS_AUTORECONF=1
 
 DOCS=( README )
 
-PATCHES=( "${FILESDIR}/${P}-build.patch" "${FILESDIR}/${P}-include.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2546-include.patch"  "${FILESDIR}/${P}-flags.patch" )