Gentoo Archives: gentoo-commits

From: Christoph Junghans <ottxor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-lang/pgi/
Date: Mon, 03 Jun 2013 23:33:39
Message-Id: 1370205830.5e5725e9bb5f35a53284c00a8114a2bb06a9f619.ottxor@gentoo
1 commit: 5e5725e9bb5f35a53284c00a8114a2bb06a9f619
2 Author: Andreas Schäfer <gentryx <AT> gmx <DOT> de>
3 AuthorDate: Sun Jun 2 20:43:50 2013 +0000
4 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 2 20:43:50 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5e5725e9
7
8 relaced custom CURL with stock version
9
10 ---
11 dev-lang/pgi/pgi-13.5.ebuild | 15 ++++++++++++++-
12 1 file changed, 14 insertions(+), 1 deletion(-)
13
14 diff --git a/dev-lang/pgi/pgi-13.5.ebuild b/dev-lang/pgi/pgi-13.5.ebuild
15 index 52a8109..d34c8c1 100644
16 --- a/dev-lang/pgi/pgi-13.5.ebuild
17 +++ b/dev-lang/pgi/pgi-13.5.ebuild
18 @@ -15,6 +15,8 @@ SLOT="0"
19 KEYWORDS="~amd64 ~x86"
20 IUSE="acml cuda java"
21
22 +RDEPEND="net-misc/curl"
23 +
24 RESTRICT="mirror strip"
25
26 QA_PREBUILT="
27 @@ -98,5 +100,16 @@ y
28 ./install <<EOF
29 ${command}
30 EOF
31 - patch -p0 <"${FILESDIR}/glibc.patch"
32 + # fix problems with PGI's C++ compiler and current glibc:
33 + cd "${ED}"
34 + patch -p0 <"${FILESDIR}/glibc.patch" || die "patch failed"
35 +
36 + # java symlink might be broken if useflag is disabled:
37 + use java || rm opt/pgi/linux86-64/13.5/jre
38 +
39 + # replace PGI's curl with the stock version:
40 + dodir /opt/pgi/linux86-64/13.5/etc/pgi_license_tool
41 + dosym /usr/bin/curl /opt/pgi/linux86-64/13.5/etc/pgi_license_tool/curl
42 + dodir /opt/pgi/linux86/13.5/etc/pgi_license_tool
43 + dosym /usr/bin/curl /opt/pgi/linux86/13.5/etc/pgi_license_tool/curl
44 }