New patch from Debian, fixes a few issue with cfortran

Package-Manager: portage-2.1.5.4

3 files changed, 34 insertions, 29 deletions

diff --git a/sci-physics/paw/ChangeLog b/sci-physics/paw/ChangeLog
index 2b8ca00744bb..615123c03429 100644
--- a/sci-physics/paw/ChangeLog
+++ b/sci-physics/paw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/paw
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/ChangeLog,v 1.2 2008/03/11 12:12:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/ChangeLog,v 1.3 2008/06/07 08:52:00 bicatali Exp $
+
+*paw-2.14.04-r2 (07 Jun 2008)
+
+  07 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org> -paw-2.14.04.ebuild,
+  +paw-2.14.04-r2.ebuild:
+  New patch from Debian, fixes a few issue with cfortran
 
 *paw-2.14.04-r1 (11 Mar 2008)
 
diff --git a/sci-physics/paw/Manifest b/sci-physics/paw/Manifest
index d708002a254d..df3d8fd09a46 100644
--- a/sci-physics/paw/Manifest
+++ b/sci-physics/paw/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST paw_2.14.04.dfsg.2-1.diff.gz 63690 RMD160 15714a33a7479a08007d48f74e71bdcfa8140ae6 SHA1 884d187babf64ac7da978affe3ede32e08cdf760 SHA256 db8fff53959799234ee56aec7b59897cf84e80c2c6438f7690c989eeea0dad2c
 DIST paw_2.14.04.dfsg.2-3.diff.gz 65981 RMD160 cfe6af963a2d9f1f44ded1091dba79616a5a756c SHA1 cbf4a8376f7d0b5a12b2733c5797fe45236f8f10 SHA256 3110efe1d9c8fee59da4b55e3d92f5730fd274d6da79a522251326c81abd34ab
+DIST paw_2.14.04.dfsg.2-5.diff.gz 65489 RMD160 f6653e4f9de885529f4c3c4703750faf41bbc234 SHA1 1afec7b1a11bb148013976303d7de564e399c2a2 SHA256 ca0b9f8c35b9025c54036af91e18775b52348c81310de9d061372fccdd4c5de7
 DIST paw_2.14.04.dfsg.2.orig.tar.gz 3334317 RMD160 2dbe9f6800960981644f65c43e53bebf0d125cde SHA1 985ba7f567b7cfccc1d059f0b6011cae9ee36993 SHA256 68925384706a4a61c477a48ed0fad539d214a4b04fdb9db5ef4e8d453f26c44e
 EBUILD paw-2.14.04-r1.ebuild 2180 RMD160 07fc0376d00202f4e882ea715a5210b79041e3c9 SHA1 5b420df4c884fb959b44055db019ad6b1675bca2 SHA256 d6a68366663bb5485fa13e891eba54de9b2246bc4d53550f5234b152371d0edb
-EBUILD paw-2.14.04.ebuild 2216 RMD160 458befdb9df07e2a767b61f4d9ef45163cbe0635 SHA1 4ba0f90631661cc6994ec63c38a2e31fb909cd1d SHA256 9fd87cc70bcc9764a6504823764955b44836896f2700af2cc820943510bfae55
-MISC ChangeLog 567 RMD160 6f089cd68e82d56f44c693a3c0e9cb94d2c17f45 SHA1 17f85f072d5f352267ff92c11ce50464b12dd3f6 SHA256 d02890fb0f261d627330625b690e5a275f69fff7a6065a708de58b9e828aee06
+EBUILD paw-2.14.04-r2.ebuild 2207 RMD160 2d56a2b1649149b41d38e56935d4733df7f8c827 SHA1 23687d7535854df03a8a2fbfa4573f40047c4695 SHA256 34058f674f07dc1e5268128023d223d6e412c631f1e63e780f80381f041abd11
+MISC ChangeLog 758 RMD160 8d9fca8f4118546343185a1fd605bab1b10f2518 SHA1 44ef3fcc0679486868ff67a05cc3ddd627fff2a4 SHA256 91e446377471121b5e97f48cbe889f30f3fd05076bbe89c409e07db4389126f1
 MISC metadata.xml 688 RMD160 6bb9b35163babdb4b34a5b0a5dd1b7c0393952e7 SHA1 e3d0da95779db91f87843bc81377938e946dba21 SHA256 cbc31d8cbfddf2bee605d85449a887950a5cc7707c1caeb623865caaee2edc11
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH1ndE1ycZbhPLE2ARArhaAJ9NOWGQmBUCFSjV+I5AgcIPb0bNgQCfQA5h
-PRFbp3oyogt2Oeua1RbFB7k=
-=2twG
+iEYEARECAAYFAkhKTDkACgkQ1ycZbhPLE2DZbwCfTZ/QPwBOLDuxUjL4cuRSmiH6
+lmAAoJ5wdMQQKel43A5DoMEEYQrCNr+E
+=sWK3
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/paw/paw-2.14.04.ebuild b/sci-physics/paw/paw-2.14.04-r2.ebuild
index 1f47f4c9daef..b86f49c80f5a 100644
--- a/sci-physics/paw/paw-2.14.04.ebuild
+++ b/sci-physics/paw/paw-2.14.04-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/paw-2.14.04.ebuild,v 1.2 2007/08/25 22:58:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/paw-2.14.04-r2.ebuild,v 1.1 2008/06/07 08:52:00 bicatali Exp $
 
 inherit eutils multilib fortran
 
 DEB_PN=paw
 DEB_PV=${PV}.dfsg.2
-DEB_PR=1
+DEB_PR=5
 DEB_P=${DEB_PN}_${DEB_PV}
 
 DESCRIPTION="CERN's Physics Analysis Workstation data analysis program"
@@ -26,7 +26,7 @@ RDEPEND="virtual/motif
 	x11-libs/xbae"
 
 DEPEND="${RDEPEND}
-	virtual/tetex
+	virtual/latex-base
 	x11-misc/imake
 	x11-misc/makedepend"
 
@@ -42,38 +42,37 @@ src_unpack() {
 
 	cd "${S}"
 	cp debian/add-ons/Makefile .
+	export DEB_BUILD_OPTIONS="${FORTRANC} nostrip nocheck"
+
 	# fix some path stuff and collision for comis.h,
 	# already installed by cernlib and replace hardcoded fortran compiler
 	sed -i \
 		-e 's:/usr/local:/usr:g' \
 		-e '/comis.h/d' \
-		-e "s/g77/${FORTRANC}/g" \
+		-e "s/gfortran/${FORTRANC}/g" \
 		Makefile || "sed'ing the Makefile failed"
 
 	einfo "Applying Debian patches"
-	emake -j1 \
-		DEB_BUILD_OPTIONS="${FORTRANC} ${nostrip}" \
-		patch || die "make patch failed"
+	emake -j1 patch || die "make patch failed"
 
 	# since we depend on cfortran, do not use the one from cernlib
-	# (adapted from debian/cernlib-debian.mk)
-	mv -f src/include/cfortran/cfortran.h \
-		src/include/cfortran/cfortran.h.disabled
-	# create local LaTeX cache directory
-	mkdir -p .texmf-var
+	rm -f src/include/cfortran/cfortran.h
 }
 
 src_compile() {
-	emake -j1 \
-		DEB_BUILD_OPTIONS="${FORTRANC} nostrip" \
-		|| die "emake failed"
+	# create local LaTeX cache directory
+	#mkdir -p .texmf-var
+	VARTEXFONTS="${T}"/fonts
+	emake -j1 cernlib-indep cernlib-arch || die "emake failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}"/shlib \
+		emake -j1 cernlib-test || die "emake test failed"
 }
 
 src_install() {
-	emake \
-		DEB_BUILD_OPTIONS="${FORTRANC} nostrip" \
-		DESTDIR="${D}" \
-		install || die "emake install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	cd "${S}"/debian
 	dodoc changelog README.* deadpool.txt copyright || die "dodoc failed"
 	newdoc add-ons/README README.add-ons || die "newdoc failed"
@@ -82,6 +81,6 @@ src_install() {
 pkg_postinst() {
 	if use amd64; then
 		elog "Please see the possible warnings in using ${PN} on 64 bits:"
-		elog "/usr/share/doc/${PF}/README.*64*"
+		elog "${ROOT}/usr/share/doc/${PF}/README.*64*"
 	fi
 }