public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: dev-lang/pgi/
@ 2013-06-03 23:33 Christoph Junghans
  0 siblings, 0 replies; 6+ messages in thread
From: Christoph Junghans @ 2013-06-03 23:33 UTC (permalink / raw
  To: gentoo-commits

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

minor fixes to comply with Gentoo coding style

---
 dev-lang/pgi/pgi-13.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/pgi/pgi-13.5.ebuild b/dev-lang/pgi/pgi-13.5.ebuild
index 354b996..52a8109 100644
--- a/dev-lang/pgi/pgi-13.5.ebuild
+++ b/dev-lang/pgi/pgi-13.5.ebuild
@@ -9,9 +9,10 @@ inherit eutils
 DESCRIPTION="PGI compiler suite"
 HOMEPAGE="http://www.pgroup.com/"
 SRC_URI="pgilinux-2013-135.tar.gz"
+
 LICENSE="PGI"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="acml cuda java"
 
 RESTRICT="mirror strip"
@@ -51,7 +52,6 @@ pkg_nofetch() {
 
 src_prepare() {
 	epatch "${FILESDIR}/terminal.patch"
-	echo "andi ${FILESDIR}"
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/pgi/
@ 2013-06-03 23:33 Christoph Junghans
  0 siblings, 0 replies; 6+ messages in thread
From: Christoph Junghans @ 2013-06-03 23:33 UTC (permalink / raw
  To: gentoo-commits

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
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/pgi/
@ 2013-06-03 23:33 Christoph Junghans
  0 siblings, 0 replies; 6+ messages in thread
From: Christoph Junghans @ 2013-06-03 23:33 UTC (permalink / raw
  To: gentoo-commits

commit:     138ed70bf5e3a03788e10fda14309fda4ce07664
Author:     Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Mon Jun  3 08:22:53 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 08:22:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=138ed70b

replacing patch with epatch

---
 dev-lang/pgi/pgi-13.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/pgi/pgi-13.5.ebuild b/dev-lang/pgi/pgi-13.5.ebuild
index d7cac8d..3e9a6ce 100644
--- a/dev-lang/pgi/pgi-13.5.ebuild
+++ b/dev-lang/pgi/pgi-13.5.ebuild
@@ -102,7 +102,7 @@ ${command}
 EOF
 	# fix problems with PGI's C++ compiler and current glibc:
 	cd "${ED}"
-	patch -p0 <"${FILESDIR}/${P}-glibc.patch" || die "patch failed"
+	epatch "${FILESDIR}/${P}-glibc.patch"
 
 	# java symlink might be broken if useflag is disabled:
 	use java || rm opt/pgi/linux86-64/13.5/jre


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/pgi/
@ 2017-09-02 11:39 David Seifert
  0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2017-09-02 11:39 UTC (permalink / raw
  To: gentoo-commits

commit:     09f32b5c282f74c542ec8339c785031b348fe68b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  2 11:38:45 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 11:38:45 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=09f32b5c

dev-lang/pgi: Remove last mentions of sci-libs/acml

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-lang/pgi/metadata.xml    |  1 -
 dev-lang/pgi/pgi-13.5.ebuild | 13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/dev-lang/pgi/metadata.xml b/dev-lang/pgi/metadata.xml
index 76552d4e1..e355aa225 100644
--- a/dev-lang/pgi/metadata.xml
+++ b/dev-lang/pgi/metadata.xml
@@ -12,7 +12,6 @@
     <name>Gentoo Cluster Project</name>
   </maintainer>
   <use>
-	<flag name="acml">Install AMD's core math library.</flag>
 	<flag name="java">Install a PGI-tuned JRE.</flag>
 	<flag name="cuda">Install PGI's CUDA components (e.g. for OpenACC)</flag>
   </use>

diff --git a/dev-lang/pgi/pgi-13.5.ebuild b/dev-lang/pgi/pgi-13.5.ebuild
index daeea40e6..0f747a78d 100644
--- a/dev-lang/pgi/pgi-13.5.ebuild
+++ b/dev-lang/pgi/pgi-13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="pgilinux-2013-135.tar.gz"
 LICENSE="PGI"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="acml cuda java"
+IUSE="cuda java"
 
 RDEPEND="net-misc/curl"
 
@@ -62,15 +62,8 @@ src_install() {
 1
 ${ED}/opt/pgi"
 
-	if use acml; then
-		command="${command}
-y
-accept
-"
-	else
-		command="${command}
+	command="${command}
 n"
-	fi
 
 	if use cuda; then
 		command="${command}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/pgi/
@ 2017-11-18 19:49 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2017-11-18 19:49 UTC (permalink / raw
  To: gentoo-commits

commit:     3f172f3c7afc1a9d9f1e98b1dd6ad3bb822683bc
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 18:15:13 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 19:49:15 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=3f172f3c

dev-lang/pgi: Bump to EAPI 6

* Fix repoman warnings

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.14, Repoman-2.3.6
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-lang/pgi/metadata.xml    |  6 +++---
 dev-lang/pgi/pgi-13.5.ebuild | 18 ++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/dev-lang/pgi/metadata.xml b/dev-lang/pgi/metadata.xml
index e355aa225..93c720670 100644
--- a/dev-lang/pgi/metadata.xml
+++ b/dev-lang/pgi/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <longdescription>
-	PGI is the C/C++/Fortran compiler suite of the Portland Group.
+    PGI is the C/C++/Fortran compiler suite of the Portland Group.
   </longdescription>
   <maintainer type="person">
     <email>gentryx@gmx.de</email>
@@ -12,7 +12,7 @@
     <name>Gentoo Cluster Project</name>
   </maintainer>
   <use>
-	<flag name="java">Install a PGI-tuned JRE.</flag>
-	<flag name="cuda">Install PGI's CUDA components (e.g. for OpenACC)</flag>
+    <flag name="java">Install a PGI-tuned JRE.</flag>
+    <flag name="cuda">Install PGI's CUDA components (e.g. for OpenACC)</flag>
   </use>
 </pkgmetadata>

diff --git a/dev-lang/pgi/pgi-13.5.ebuild b/dev-lang/pgi/pgi-13.5.ebuild
index 0f747a78d..19c636132 100644
--- a/dev-lang/pgi/pgi-13.5.ebuild
+++ b/dev-lang/pgi/pgi-13.5.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=6
 
 DESCRIPTION="PGI compiler suite"
 HOMEPAGE="http://www.pgroup.com/"
@@ -46,15 +44,13 @@ QA_PREBUILT="
 
 S="${WORKDIR}"
 
+PATCHES=( "${FILESDIR}"/${P}-terminal.patch )
+
 pkg_nofetch() {
 	einfo "PGI doesn't provide direct download links. Please download"
 	einfo "${ARCHIVE} from ${HOMEPAGE}"
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-terminal.patch"
-}
-
 src_install() {
 	dodir /opt/pgi
 
@@ -97,11 +93,13 @@ EOF
 	epatch "${FILESDIR}/${P}-glibc.patch"
 
 	# java symlink might be broken if useflag is disabled:
-	use java || rm opt/pgi/linux86-64/13.5/jre
+	if ! use java; then
+		rm opt/pgi/linux86-64/13.5/jre || die
+	fi
 
 	# 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
+	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
+	dosym ../../../../../../usr/bin/curl /opt/pgi/linux86/13.5/etc/pgi_license_tool/curl
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/pgi/
@ 2021-03-04 13:53 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-03-04 13:53 UTC (permalink / raw
  To: gentoo-commits

commit:     c1652cc0694b9f09eb7372d6d1050343866190ba
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu Mar  4 13:51:55 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Mar  4 13:51:55 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c1652cc0

dev-lang/pgi: remove RedundantLongDescription

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 dev-lang/pgi/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dev-lang/pgi/metadata.xml b/dev-lang/pgi/metadata.xml
index c6b14e0fd..b9e493f21 100644
--- a/dev-lang/pgi/metadata.xml
+++ b/dev-lang/pgi/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<longdescription>
-PGI is the C/C++/Fortran compiler suite of the Portland Group.
-</longdescription>
 	<maintainer type="person">
 		<email>gentryx@gmx.de</email>
 	</maintainer>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-03-04 13:54 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-03 23:33 [gentoo-commits] proj/sci:master commit in: dev-lang/pgi/ Christoph Junghans
  -- strict thread matches above, loose matches on Subject: below --
2021-03-04 13:53 Andrew Ammerlaan
2017-11-18 19:49 Justin Lecher
2017-09-02 11:39 David Seifert
2013-06-03 23:33 Christoph Junghans
2013-06-03 23:33 Christoph Junghans

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox