From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-595184-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 3AA541381F3
	for <garchives@archives.gentoo.org>; Mon,  3 Jun 2013 23:33:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 05E87E09EE;
	Mon,  3 Jun 2013 23:33:38 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 66B7BE09EE
	for <gentoo-commits@lists.gentoo.org>; Mon,  3 Jun 2013 23:33:37 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 7BCDF33E116
	for <gentoo-commits@lists.gentoo.org>; Mon,  3 Jun 2013 23:33:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 2A47FE5462
	for <gentoo-commits@lists.gentoo.org>; Mon,  3 Jun 2013 23:33:35 +0000 (UTC)
From: "Christoph Junghans" <ottxor@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" <ottxor@gentoo.org>
Message-ID: <1370205830.5e5725e9bb5f35a53284c00a8114a2bb06a9f619.ottxor@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: dev-lang/pgi/
X-VCS-Repository: proj/sci
X-VCS-Files: dev-lang/pgi/pgi-13.5.ebuild
X-VCS-Directories: dev-lang/pgi/
X-VCS-Committer: ottxor
X-VCS-Committer-Name: Christoph Junghans
X-VCS-Revision: 5e5725e9bb5f35a53284c00a8114a2bb06a9f619
X-VCS-Branch: master
Date: Mon,  3 Jun 2013 23:33:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: dac49c42-7181-4f1d-92e4-81d3d6293627
X-Archives-Hash: 648a7b0a613e2b207d4a9a48286ce867

commit:     5e5725e9bb5f35a53284c00a8114a2bb06a9f619
Author:     Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Sun Jun  2 20:43:50 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 20:43:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5e5725e9

relaced custom CURL with stock version

---
 dev-lang/pgi/pgi-13.5.ebuild | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev-lang/pgi/pgi-13.5.ebuild b/dev-lang/pgi/pgi-13.5.ebuild
index 52a8109..d34c8c1 100644
--- a/dev-lang/pgi/pgi-13.5.ebuild
+++ b/dev-lang/pgi/pgi-13.5.ebuild
@@ -15,6 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="acml cuda java"
 
+RDEPEND="net-misc/curl"
+
 RESTRICT="mirror strip"
 
 QA_PREBUILT="
@@ -98,5 +100,16 @@ y
 	./install <<EOF
 ${command}
 EOF
-	patch -p0 <"${FILESDIR}/glibc.patch"
+	# fix problems with PGI's C++ compiler and current glibc:
+	cd "${ED}"
+	patch -p0 <"${FILESDIR}/glibc.patch" || die "patch failed"
+
+	# java symlink might be broken if useflag is disabled:
+	use java || rm opt/pgi/linux86-64/13.5/jre
+
+	# replace PGI's curl with the stock version:
+	dodir /opt/pgi/linux86-64/13.5/etc/pgi_license_tool
+	dosym /usr/bin/curl /opt/pgi/linux86-64/13.5/etc/pgi_license_tool/curl
+	dodir /opt/pgi/linux86/13.5/etc/pgi_license_tool
+	dosym /usr/bin/curl /opt/pgi/linux86/13.5/etc/pgi_license_tool/curl
 }