Added libXaw as dependency, removed src_test (bug #231208)

Package-Manager: portage-2.1.4.4

4 files changed, 17 insertions, 107 deletions

diff --git a/sci-physics/paw/ChangeLog b/sci-physics/paw/ChangeLog
index 6db754a21156..ed6ab2fee77c 100644
--- a/sci-physics/paw/ChangeLog
+++ b/sci-physics/paw/ChangeLog
@@ -1,6 +1,10 @@
 # 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.5 2008/06/29 07:55:15 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/ChangeLog,v 1.6 2008/07/10 18:29:08 bicatali Exp $
+
+  10 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -paw-2.14.04-r1.ebuild, paw-2.14.04-r2.ebuild:
+  Added libXaw as dependency, removed src_test (bug #231208)
 
   29 Jun 2008; Torsten Veller <tove@gentoo.org> paw-2.14.04-r1.ebuild,
   paw-2.14.04-r2.ebuild:
diff --git a/sci-physics/paw/Manifest b/sci-physics/paw/Manifest
index 98bb3c3204fe..60e11199dfe0 100644
--- a/sci-physics/paw/Manifest
+++ b/sci-physics/paw/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-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-6.diff.gz 66142 RMD160 beb919434e2a10c4e6a8d3ba755ff247cbc6ca57 SHA1 973cb19c72ed7d78850658bad717db41d3939d51 SHA256 292942fc497469159506f9bfb513ba90c920bdee360c401d7214a5bdd7abffe2
 DIST paw_2.14.04.dfsg.2.orig.tar.gz 3334317 RMD160 2dbe9f6800960981644f65c43e53bebf0d125cde SHA1 985ba7f567b7cfccc1d059f0b6011cae9ee36993 SHA256 68925384706a4a61c477a48ed0fad539d214a4b04fdb9db5ef4e8d453f26c44e
-EBUILD paw-2.14.04-r1.ebuild 2185 RMD160 dc3be32e77cd75d79601a9cb32cd0cc1fd86a679 SHA1 2ed67e90e69dc8b27ea9caa12bba9f7b54f4069f SHA256 689c41460d38c977c30c39f9e9768c30dec547971e90f682973c8569bb2dcb24
-EBUILD paw-2.14.04-r2.ebuild 2212 RMD160 f3eb946bdabceb6faf56b57114aee5a1c0f6c71d SHA1 62a16c51cdde3e47565530a4af9ff73916e99ebf SHA256 edab1edc4f3b09455c774fc8a9c6b2c2c57a04f7b6c892a25df5afe199440bd6
-MISC ChangeLog 1065 RMD160 bee699fcc8ed884ef8b81b4580a17fbb9db36202 SHA1 5c38326ab69760fc07f4f17cde1031acc4a4b5ab SHA256 e0dd3436ced4c5e66d444e17ff7afce8caeb6b7b40ee6e295ecf06ac881c1e6b
+EBUILD paw-2.14.04-r2.ebuild 2057 RMD160 668368681b33d1df7474a49df9559cd7f03f0527 SHA1 079f91ed0b376a157e22684131e53762f4c56684 SHA256 f29e3eb67a7ac0626e5419f376c5c5749af8cb65076114dd5b31ab73b15d3c74
+MISC ChangeLog 1235 RMD160 6a28a2aa5c748b7cd7c13b42f087ee5cb73db9e1 SHA1 a24734ec41cafffcd398539d194e650d6435527d SHA256 ce66730a2dd7cf3f3eb09a85ee8103d14baf6933a72c140e9fdec284c617d46f
 MISC metadata.xml 688 RMD160 6bb9b35163babdb4b34a5b0a5dd1b7c0393952e7 SHA1 e3d0da95779db91f87843bc81377938e946dba21 SHA256 cbc31d8cbfddf2bee605d85449a887950a5cc7707c1caeb623865caaee2edc11
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhnP+oACgkQV3J2n04EauzYPACeJU55I5JRC8jLHReB2sahQFGt
-abYAn0d/TDN2Fgot2CKW6cJNjZvJlq2o
-=jThR
+iEYEARECAAYFAkh2VQAACgkQ1ycZbhPLE2BIuQCfVI9cT1YQjsUxwJ0hW+7QAc+a
+vxAAnjHjxTt3B+sb2DD2Bathuz5g8I9x
+=e3BL
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/paw/paw-2.14.04-r1.ebuild b/sci-physics/paw/paw-2.14.04-r1.ebuild
deleted file mode 100644
index 541101ee1940..000000000000
--- a/sci-physics/paw/paw-2.14.04-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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-r1.ebuild,v 1.3 2008/06/29 07:55:15 tove Exp $
-
-inherit eutils multilib fortran
-
-DEB_PN=paw
-DEB_PV=${PV}.dfsg.2
-DEB_PR=3
-DEB_P=${DEB_PN}_${DEB_PV}
-
-DESCRIPTION="CERN's Physics Analysis Workstation data analysis program"
-HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/paw/index.html"
-LICENSE="GPL-2 LGPL-2 BSD"
-SRC_URI="mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
-	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-libs/openmotif
-	virtual/lapack
-	dev-lang/cfortran
-	sci-physics/cernlib
-	x11-libs/xbae"
-
-DEPEND="${RDEPEND}
-	virtual/latex-base
-	x11-misc/imake
-	x11-misc/makedepend"
-
-S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
-
-KEYWORDS="~amd64 ~x86"
-
-FORTRAN="gfortran g77 ifc"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${DEB_P}-${DEB_PR}".diff
-
-	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/gfortran/${FORTRANC}/g" \
-		Makefile || die "sed'ing the Makefile failed"
-
-	einfo "Applying Debian patches"
-	emake -j1 patch || die "make patch failed"
-
-	# since we depend on cfortran, do not use the one from cernlib
-	rm -f src/include/cfortran/cfortran.h
-}
-
-src_compile() {
-	# create local LaTeX cache directory
-	mkdir -p .texmf-var
-	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 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"
-}
-
-pkg_postinst() {
-	if use amd64; then
-		elog "Please see the possible warnings in using ${PN} on 64 bits:"
-		elog "${ROOT}/usr/share/doc/${PF}/README.*64*"
-	fi
-}
diff --git a/sci-physics/paw/paw-2.14.04-r2.ebuild b/sci-physics/paw/paw-2.14.04-r2.ebuild
index 2c2ac913188f..07ab0b06151e 100644
--- a/sci-physics/paw/paw-2.14.04-r2.ebuild
+++ b/sci-physics/paw/paw-2.14.04-r2.ebuild
@@ -1,12 +1,12 @@
 # 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-r2.ebuild,v 1.3 2008/06/29 07:55:15 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/paw-2.14.04-r2.ebuild,v 1.4 2008/07/10 18:29:08 bicatali Exp $
 
 inherit eutils multilib fortran
 
 DEB_PN=paw
 DEB_PV=${PV}.dfsg.2
-DEB_PR=5
+DEB_PR=6
 DEB_P=${DEB_PN}_${DEB_PV}
 
 DESCRIPTION="CERN's Physics Analysis Workstation data analysis program"
@@ -19,13 +19,13 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE=""
 
-RDEPEND="x11-libs/openmotif
-	virtual/lapack
-	dev-lang/cfortran
-	sci-physics/cernlib
+RDEPEND="sci-physics/cernlib
+	x11-libs/libXaw
+	x11-libs/openmotif
 	x11-libs/xbae"
 
 DEPEND="${RDEPEND}
+	dev-lang/cfortran
 	virtual/latex-base
 	x11-misc/imake
 	x11-misc/makedepend"
@@ -60,17 +60,10 @@ src_unpack() {
 }
 
 src_compile() {
-	# 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 DESTDIR="${D}" install || die "emake install failed"
 	cd "${S}"/debian