public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-libs/pgplot: pgplot-5.2.2-r3.ebuild ChangeLog
@ 2008-11-07 12:56 Sebastien Fabbro (bicatali)
  0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2008-11-07 12:56 UTC (permalink / raw
  To: gentoo-commits

bicatali    08/11/07 12:56:54

  Modified:             pgplot-5.2.2-r3.ebuild ChangeLog
  Log:
  Fixed for parallel build
  (Portage version: 2.2_rc12/cvs/Linux 2.6.25-gentoo-r7 x86_64)

Revision  Changes    Path
1.2                  sci-libs/pgplot/pgplot-5.2.2-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild?r1=1.1&r2=1.2

Index: pgplot-5.2.2-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pgplot-5.2.2-r3.ebuild	5 Nov 2008 21:50:18 -0000	1.1
+++ pgplot-5.2.2-r3.ebuild	7 Nov 2008 12:56:54 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild,v 1.1 2008/11/05 21:50:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild,v 1.2 2008/11/07 12:56:54 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -82,14 +82,15 @@
 
 src_compile() {
 	./makemake . linux
-
-	emake all cpg || die "emake failed"
+	einfo "Doing static libs and execs"
+	emake all cpg || die "emake static failed"
 	emake clean
-	einfo "Doing "
+	einfo "Doing shared libs"
 	emake \
 		CFLAGS="${CFLAGS} -fPIC" \
 		FFLAGS="${FFLAGS} -fPIC" \
-		shared cpg-shared || die "emake shared failed"
+		shared cpg-shared \
+		|| die "emake shared failed"
 
 	if use doc; then
 		emake pgplot.html || die "make pgplot.html failed"
@@ -110,7 +111,7 @@
 		# j can also be LATEX CPS...
 		for j in NULL PNG PS CPS LATEX; do
 			local testexe=./test_${j}_${i}
-			echo "./pgdemo${i} <<EOF" > ${testexe}
+			echo "LD_LIBRARY_PATH=. ./pgdemo${i} <<EOF" > ${testexe}
 			echo "/${j}" >> ${testexe}
 			echo "EOF" >> ${testexe}
 			sh ${testexe} || die "test ${i} failed"
@@ -120,20 +121,18 @@
 
 src_install() {
 	insinto /usr/$(get_libdir)/pgplot
-	doins grfont.dat grexec.f *.inc rgb.txt
+	doins grfont.dat grexec.f *.inc rgb.txt || die
 
 	# FORTRAN libs
 	dolib.a libpgplot.a || die "dolib.a failed"
-	dolib.so libpgplot.so.5 || die "dolib.so failed"
-	dosym libpgplot.so.5 /usr/$(get_libdir)/libpgplot.so || die
+	dolib.so libpgplot.so* || die "dolib.so failed"
 	dobin pgxwin_server pgdisp || die "dobin failed"
 
 	# C binding
 	insinto /usr/include
 	doins cpgplot.h || die "doins C binding failed"
 	dolib.a libcpgplot.a || die "dolib.a failed"
-	dolib.so libcpgplot.so.5 || die "dolib C failed"
-	dosym libcpgplot.so.5 /usr/$(get_libdir)/libcpgplot.so || die
+	dolib.so libcpgplot.so* || die "dolib C failed"
 
 	if use motif; then
 		doins XmPgplot.h || die "doins motif failed"



1.15                 sci-libs/pgplot/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	5 Nov 2008 21:50:18 -0000	1.14
+++ ChangeLog	7 Nov 2008 12:56:54 -0000	1.15
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/pgplot
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.14 2008/11/05 21:50:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.15 2008/11/07 12:56:54 bicatali Exp $
+
+  07 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/pgplot-makemake.patch, pgplot-5.2.2-r3.ebuild:
+  Fixed for parallel build
 
 *pgplot-5.2.2-r3 (05 Nov 2008)
 






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

* [gentoo-commits] gentoo-x86 commit in sci-libs/pgplot: pgplot-5.2.2-r3.ebuild ChangeLog
@ 2010-03-15  5:45 Sebastien Fabbro (bicatali)
  0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2010-03-15  5:45 UTC (permalink / raw
  To: gentoo-commits

bicatali    10/03/15 05:45:43

  Modified:             pgplot-5.2.2-r3.ebuild ChangeLog
  Log:
  Removed fortran eclass and switched to EAPI2
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  sci-libs/pgplot/pgplot-5.2.2-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild?r1=1.4&r2=1.5

Index: pgplot-5.2.2-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pgplot-5.2.2-r3.ebuild	23 Feb 2009 17:30:38 -0000	1.4
+++ pgplot-5.2.2-r3.ebuild	15 Mar 2010 05:45:42 -0000	1.5
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild,v 1.4 2009/02/23 17:30:38 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild,v 1.5 2010/03/15 05:45:42 bicatali Exp $
 
-inherit eutils toolchain-funcs fortran
+EAPI=2
+inherit eutils toolchain-funcs
 
 MY_P="${PN}${PV//.}"
 DESCRIPTION="FORTRAN/C device-independent scientific graphic library"
@@ -22,19 +23,14 @@
 
 S="${WORKDIR}/${PN}"
 
-FORTRAN="g77 gfortran ifc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-drivers.patch
 	epatch "${FILESDIR}"/${PN}-makemake.patch
 	epatch "${FILESDIR}"/${PN}-compile-setup.patch
 	epatch "${FILESDIR}"/${PN}-headers.patch
 
 	# gfortran < 4.3 does not compile gif, pp and wd drivers
-	if [[ "${FORTRANC}" == gfortran ]] &&
+	if [[ "$(tc-getFC)" == gfortran ]] &&
 		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] ; then
 		ewarn
 		ewarn "Warning!"
@@ -60,11 +56,11 @@
 	cp sys_linux/g77_gcc.conf local.conf
 
 	sed -i \
-		-e "s:FCOMPL=.*:FCOMPL=\"${FORTRANC}\":g" \
+		-e "s:FCOMPL=.*:FCOMPL=\"$(tc-getFC)\":g" \
 		-e "s:CCOMPL=.*:CCOMPL=\"$(tc-getCC)\":g" \
 		local.conf || die "sed flags failed"
 
-	if [[ "${FORTRANC}" = if* ]]; then
+	if [[ "$(tc-getFC)" = if* ]]; then
 		sed -i \
 			-e 's/-Wall//g' \
 			-e 's/TK_LIBS="/TK_LIBS="-nofor-main /' \



1.18                 sci-libs/pgplot/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/ChangeLog?r1=1.17&r2=1.18

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog	23 Feb 2009 17:30:38 -0000	1.17
+++ ChangeLog	15 Mar 2010 05:45:42 -0000	1.18
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/pgplot
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.17 2009/02/23 17:30:38 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.18 2010/03/15 05:45:42 bicatali Exp $
+
+  15 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  pgplot-5.2.2-r3.ebuild:
+  Removed fortran eclass and switched to EAPI2
 
   23 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
   pgplot-5.2.2-r3.ebuild:






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

end of thread, other threads:[~2010-03-15  5:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-07 12:56 [gentoo-commits] gentoo-x86 commit in sci-libs/pgplot: pgplot-5.2.2-r3.ebuild ChangeLog Sebastien Fabbro (bicatali)
  -- strict thread matches above, loose matches on Subject: below --
2010-03-15  5:45 Sebastien Fabbro (bicatali)

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