aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-05-15 08:19:29 +0200
committerJustin Lecher <jlec@gentoo.org>2013-05-15 08:19:29 +0200
commitf9333efdd2335abaa5be654ab21fbb55f9fe17a1 (patch)
tree76bf9714a7b9640c39b23cbcaa9cad1843d82308
parentsci-chemistry/curvefit: Add missing eclass inherit (diff)
parentMerge pull request #70 from jauhien/berkeley_upc_2.16.2 (diff)
downloadsci-f9333efdd2335abaa5be654ab21fbb55f9fe17a1.tar.gz
sci-f9333efdd2335abaa5be654ab21fbb55f9fe17a1.tar.bz2
sci-f9333efdd2335abaa5be654ab21fbb55f9fe17a1.zip
Merge remote-tracking branch 'github/master'
* github/master: dev-lang/berkeley_upc and dev-lang/berkeley_upc_translator: version bump
-rw-r--r--dev-lang/berkeley_upc/ChangeLog6
-rw-r--r--dev-lang/berkeley_upc/Manifest2
-rw-r--r--dev-lang/berkeley_upc/berkeley_upc-2.16.2.ebuild (renamed from dev-lang/berkeley_upc/berkeley_upc-2.16.0.ebuild)0
-rw-r--r--dev-lang/berkeley_upc_translator/ChangeLog8
-rw-r--r--dev-lang/berkeley_upc_translator/Manifest2
-rw-r--r--dev-lang/berkeley_upc_translator/berkeley_upc_translator-2.16.2.ebuild (renamed from dev-lang/berkeley_upc_translator/berkeley_upc_translator-2.16.0.ebuild)5
-rw-r--r--dev-lang/berkeley_upc_translator/files/berkeley_upc_translator-2.16.0-stackoverflow.patch18
7 files changed, 17 insertions, 24 deletions
diff --git a/dev-lang/berkeley_upc/ChangeLog b/dev-lang/berkeley_upc/ChangeLog
index cb902f129..596d73fab 100644
--- a/dev-lang/berkeley_upc/ChangeLog
+++ b/dev-lang/berkeley_upc/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*berkeley_upc-2.16.2 (14 May 2013)
+
+ 14 May 2013; Jauhien Piatlicki (jauhien) <piatlicki@gmail.com>
+ -berkeley_upc-2.16.0.ebuild, +berkeley_upc-2.16.2.ebuild:
+ version bump
+
*berkeley_upc-2.16.0 (17 Mar 2013)
17 Mar 2013; Jauhien Piatlicki (jauhien) <piatlicki@gmail.com>
diff --git a/dev-lang/berkeley_upc/Manifest b/dev-lang/berkeley_upc/Manifest
index 31d78a44b..a3e417b39 100644
--- a/dev-lang/berkeley_upc/Manifest
+++ b/dev-lang/berkeley_upc/Manifest
@@ -1 +1 @@
-DIST berkeley_upc-2.16.0.tar.gz 6459848 SHA256 0435bcfe82441dc8879b4d256f654525412eecb9e353b677a3e06e9318ed357e SHA512 e1df721ab8b63e998eaba1ce1d763a78a8c1b290b05e0d8f8168cc5bb99f98c6bdf6847a22cdbad31b3a204d5e699dbdc5add7c73cb0c51a812ee776cb1a085f WHIRLPOOL 928cb36ea094f417d1ed547a3d12eadc420abed23f2d883b7e8f42109b978a0e097adac11c6f6a0ba55ecddf52fc9d5c37ebb0c61ef190d7687d4ab76059a360
+DIST berkeley_upc-2.16.2.tar.gz 6544935 SHA256 61b398417f3ceb86a73360122cad31feb77a9aa706c01bfba3a93231b1534c2d SHA512 fa7f7f6a36dd2a0c064daf301813f566fbd59a68c9186c81962384a98a2989c0ed26a816dd8196e388a714ca53dcbb34d27fffbdea33f1a29a70217d64cbe8f4 WHIRLPOOL 2b9284fe5c883f41e479536bf78badbc303fb33c487721234919f4980c82ab342c90c7304a5c419642320759584b45daa4def1f9768f4a7dc9b85e20c29458b9
diff --git a/dev-lang/berkeley_upc/berkeley_upc-2.16.0.ebuild b/dev-lang/berkeley_upc/berkeley_upc-2.16.2.ebuild
index 19e12d340..19e12d340 100644
--- a/dev-lang/berkeley_upc/berkeley_upc-2.16.0.ebuild
+++ b/dev-lang/berkeley_upc/berkeley_upc-2.16.2.ebuild
diff --git a/dev-lang/berkeley_upc_translator/ChangeLog b/dev-lang/berkeley_upc_translator/ChangeLog
index b7e769de8..b1328f859 100644
--- a/dev-lang/berkeley_upc_translator/ChangeLog
+++ b/dev-lang/berkeley_upc_translator/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*berkeley_upc_translator-2.16.2 (14 May 2013)
+
+ 14 May 2013; Jauhien Piatlicki (jauhien) <piatlicki@gmail.com>
+ -berkeley_upc_translator-2.16.0.ebuild,
+ -files/berkeley_upc_translator-2.16.0-stackoverflow.patch,
+ +berkeley_upc_translator-2.16.2.ebuild:
+ version bump, removed stackoverflow.patch as UPC bug#3141 fixed in upstream
+
*berkeley_upc_translator-2.16.0 (19 Mar 2013)
19 Mar 2013; Jauhien Piatlicki (jauhien) <piatlicki@gmail.com>
diff --git a/dev-lang/berkeley_upc_translator/Manifest b/dev-lang/berkeley_upc_translator/Manifest
index 627b1f5c0..7eaf9f494 100644
--- a/dev-lang/berkeley_upc_translator/Manifest
+++ b/dev-lang/berkeley_upc_translator/Manifest
@@ -1 +1 @@
-DIST berkeley_upc_translator-2.16.0.tar.gz 7255911 SHA256 72cc1933e481f6603cb74c7df3a4dfd09d89aaec61e3c93c8f3404e33c458149 SHA512 6ede727f6df661d844a6b71c41923edb4ba3db18a5fe4a67d42f6293d94ddcd3cac96af2c9cee7016a34dc126024921bfe1ba11b13766d2ccdb8935a4e3a8bc5 WHIRLPOOL 9694542b303eba32687839694d9fc16795276907ef45cf4e88ca6ae2cc76e7dd9d83e14bb9cfca866c035158abf5741b1e114dfb16cab3db0b727b0e23baebf3
+DIST berkeley_upc_translator-2.16.2.tar.gz 7257272 SHA256 756e80389d251cfbb118676a10c621ef25b5a38e92f43a0305d51a2359214670 SHA512 e7bef6697f434d8ed0d7492d1bfc222884ba46aa96f6981949e505e0407feff738bebbbcc00cb74e0690b3b0a91700c6e530aff362d9085023e7cc2e163bb4ba WHIRLPOOL e87d2db31b93b04f546ac507c5e06399d33dc23557cffd60e5e875cf9acfd76ab69490df450e2ebb056f045b82e2771fd2e88b194755567ead581fb19efbfed0
diff --git a/dev-lang/berkeley_upc_translator/berkeley_upc_translator-2.16.0.ebuild b/dev-lang/berkeley_upc_translator/berkeley_upc_translator-2.16.2.ebuild
index 9112d6658..92f868b2e 100644
--- a/dev-lang/berkeley_upc_translator/berkeley_upc_translator-2.16.0.ebuild
+++ b/dev-lang/berkeley_upc_translator/berkeley_upc_translator-2.16.2.ebuild
@@ -16,10 +16,7 @@ KEYWORDS="~x86"
IUSE=""
DEPEND="app-shells/tcsh"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-stackoverflow.patch
-}
+RDEPEND="dev-lang/berkeley_upc"
src_compile() {
emake -j1
diff --git a/dev-lang/berkeley_upc_translator/files/berkeley_upc_translator-2.16.0-stackoverflow.patch b/dev-lang/berkeley_upc_translator/files/berkeley_upc_translator-2.16.0-stackoverflow.patch
deleted file mode 100644
index 44c6a8e78..000000000
--- a/dev-lang/berkeley_upc_translator/files/berkeley_upc_translator-2.16.0-stackoverflow.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Paul H. Hargrove
-See https://upc-bugs.lbl.gov/bugzilla/show_bug.cgi?id=3141
---- open64/osprey1.0/gccfe/tree_symtab.h
-+++ open64/osprey1.0/gccfe/tree_symtab.h
-@@ -45,7 +45,12 @@
- #include <set>
- #include <upc_symtab_utils.h>
-
--#define MAX_PATH 500
-+#include <limits>
-+#ifdef PATH_MAX
-+ #define MAX_PATH PATH_MAX
-+#else
-+ #define MAX_PATH 4096
-+#endif
-
- extern int Scope_level;
- extern int For_scope;