7 files changed, 112 insertions, 24 deletions
diff --git a/sci-physics/paw/ChangeLog b/sci-physics/paw/ChangeLog
index a9f47b1f8..ed4c0f165 100644
--- a/sci-physics/paw/ChangeLog
+++ b/sci-physics/paw/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-physics/paw
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Apr 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  paw-2.14.04-r1.ebuild, +paw-2.14.04-r2.ebuild, metadata.xml:
+  version adapted for cernlib-2006 paw new revision for cernlib-2006
+
 *paw-2.14.04-r1 (15 Oct 2006)
 
   15 Oct 2006; Sebastien Fabbro <seb@ist.utl.pt> 
diff --git a/sci-physics/paw/Manifest b/sci-physics/paw/Manifest
index 593f09749..9c368fb5d 100644
--- a/sci-physics/paw/Manifest
+++ b/sci-physics/paw/Manifest
@@ -1,17 +1,26 @@
-DIST paw_2.14.04-6.diff.gz 61809 RMD160 3bd1fadf938fff1af987e7d6b882ef6ba7a03a92 SHA1 3fd814ec50ac3644dd23b94f515b371b65f2a284 SHA256 e40f8e9fa5a9683634eebf66fa51dc8307205e266584433edea74c32b1983972
+DIST paw_2.14.04-7.diff.gz 62407 RMD160 01bd0b3b192097dc97b9d7e0f881e4fe016dddec SHA1 c0921630951201a549e9cd2662659b5e9093ffdd SHA256 9136791638cf1601388d786eb33d25a500c3babfc1508ac1a45f358eb9aba197
+DIST paw_2.14.04.dfsg-1.diff.gz 61966 RMD160 f148424f02514527ba16e0123a4ad45fb7644178 SHA1 120db3459a9a37af265da647dc84dbe4a6a47be6 SHA256 baa5a9f18ff0517993bbe783609cd57a2b1c26acac5564f508d7067165c98cbd
+DIST paw_2.14.04.dfsg.orig.tar.gz 3334350 RMD160 8a5185ff765723e07da2437acc98ca2a8cb905b0 SHA1 d7812e6e95af6d9b0382ccc037d30c1c4e885b01 SHA256 b034a7b70e2e56ca114f34c427869338eed3ac12e8a28b5f8eef1e38dbbb676b
 DIST paw_2.14.04.orig.tar.gz 3333012 RMD160 5cf61384952bc1b9600a4ab04269f52eb342d5fc SHA1 e9b30ceff8ab0cdb276e62aa580d3e4d45a4176a SHA256 65c6cbb385c027c44197e0b63d8308283098323d7ba08377492c1b70c3158906
-EBUILD paw-2.14.04-r1.ebuild 1210 RMD160 4cf3cd78e922d2a80c064adf4d69648d24d2b8ab SHA1 a831558bb6a1621cf88f858ed21caa3d3176287d SHA256 0e1e4033b73842e59bf8e7ef3143d911635a18e962e5960804763cd0ead8f084
-MD5 1bce303427566b9765f000c11e9667e7 paw-2.14.04-r1.ebuild 1210
-RMD160 4cf3cd78e922d2a80c064adf4d69648d24d2b8ab paw-2.14.04-r1.ebuild 1210
-SHA256 0e1e4033b73842e59bf8e7ef3143d911635a18e962e5960804763cd0ead8f084 paw-2.14.04-r1.ebuild 1210
-MISC ChangeLog 436 RMD160 b6d38282b6a192cb469ff98b84eab00a50a5bfd9 SHA1 45cc10c6ecc0f44f922c72eadd72e5dd1434aa17 SHA256 1ab22d72bdcace5004eb1aec5966d03c0266eab6303bfd66f96c088671a6421a
-MD5 63be806a883fef5282f4ef2056de8b6b ChangeLog 436
-RMD160 b6d38282b6a192cb469ff98b84eab00a50a5bfd9 ChangeLog 436
-SHA256 1ab22d72bdcace5004eb1aec5966d03c0266eab6303bfd66f96c088671a6421a ChangeLog 436
-MISC metadata.xml 166 RMD160 1ae5f7801342238b8aa33deaeebc1e75bfdeb72f SHA1 1547ac795b35a4292506472ac0fabbe7097ec827 SHA256 e725f0f6bc4ef7c10473269dba4c4add3a2134a21828706973356f78e56dff19
-MD5 9e3c2dac273d5b6a32226cc439c0de09 metadata.xml 166
-RMD160 1ae5f7801342238b8aa33deaeebc1e75bfdeb72f metadata.xml 166
-SHA256 e725f0f6bc4ef7c10473269dba4c4add3a2134a21828706973356f78e56dff19 metadata.xml 166
-MD5 708577671f6c1e27af3d885b393ec8c6 files/digest-paw-2.14.04-r1 494
-RMD160 cbe3a47cedf0ca1779dcb3eeb909d6f1161d4c12 files/digest-paw-2.14.04-r1 494
-SHA256 b4a3c18229250fcc1ef1be80a320e01c3d2b8bab4643ccaebb38e0536fc01821 files/digest-paw-2.14.04-r1 494
+EBUILD paw-2.14.04-r1.ebuild 1217 RMD160 b486b0c6466ad91c24afad111a227747b6eb3983 SHA1 437f9837030db319788209a90792fe4538d87d17 SHA256 502ec259865783e29a88240e57a628820a75f02d74d3ab1a8797ffe95c4ce037
+MD5 461b976606d831ddccf853026323e781 paw-2.14.04-r1.ebuild 1217
+RMD160 b486b0c6466ad91c24afad111a227747b6eb3983 paw-2.14.04-r1.ebuild 1217
+SHA256 502ec259865783e29a88240e57a628820a75f02d74d3ab1a8797ffe95c4ce037 paw-2.14.04-r1.ebuild 1217
+EBUILD paw-2.14.04-r2.ebuild 1457 RMD160 d436ad0ab4d349dcdfa115ccdc3fd620456a14de SHA1 6864aaaa061f830baad72c9acfbb40bc92571dbe SHA256 0270ca2f68b78cbbc98178c19e10e72d1042facb3f3524b89a672d1414fd8fd5
+MD5 df2f0514cf6c6b140a39d7edc6d0c1d7 paw-2.14.04-r2.ebuild 1457
+RMD160 d436ad0ab4d349dcdfa115ccdc3fd620456a14de paw-2.14.04-r2.ebuild 1457
+SHA256 0270ca2f68b78cbbc98178c19e10e72d1042facb3f3524b89a672d1414fd8fd5 paw-2.14.04-r2.ebuild 1457
+MISC ChangeLog 624 RMD160 8d45c91d4915a03c95241c4fce2ee0cee706c008 SHA1 dad0604196ea85809d2ec3478743ec2e75744128 SHA256 bd6d0634d13839b50363e0a8b235bb9447f72ce0001df2d12f2672f62eadc839
+MD5 b5e4706f709701e642b6080fff81a76c ChangeLog 624
+RMD160 8d45c91d4915a03c95241c4fce2ee0cee706c008 ChangeLog 624
+SHA256 bd6d0634d13839b50363e0a8b235bb9447f72ce0001df2d12f2672f62eadc839 ChangeLog 624
+MISC metadata.xml 672 RMD160 b58513a2dcf581528ec21a29a35ba9ba2cbe52a8 SHA1 4e981e91c97e9fa50af7931c256965f916010ff1 SHA256 e6c2bdf31af10b1bfa8af78321ff9cda07af4fc0ff6066ba6cfee1f5d1f4e965
+MD5 16d743914d1ae9bf7ced8493f3fa67ef metadata.xml 672
+RMD160 b58513a2dcf581528ec21a29a35ba9ba2cbe52a8 metadata.xml 672
+SHA256 e6c2bdf31af10b1bfa8af78321ff9cda07af4fc0ff6066ba6cfee1f5d1f4e965 metadata.xml 672
+MD5 3f3aa7fe245e01433667d777d26bc8dd files/digest-paw-2.14.04-r1 494
+RMD160 68937f9e525501bae5a93711d6b30c9eefdb5a93 files/digest-paw-2.14.04-r1 494
+SHA256 c5bb3e3a6a44fdbac92b3d9d9af975d02b8ccfa34986a9de2bd935796191de6f files/digest-paw-2.14.04-r1 494
+MD5 5ab53b59521bedeca585b2a1469804fe files/digest-paw-2.14.04-r2 524
+RMD160 8771a81ae072f93aa39ebc5729f7e7daeabeb025 files/digest-paw-2.14.04-r2 524
+SHA256 a222e2ccaa61331b1b464dfd97e11c54e4ea884cf0ee08ab6900f39d81a4a848 files/digest-paw-2.14.04-r2 524
diff --git a/sci-physics/paw/files/digest-paw-2.14.04-r1 b/sci-physics/paw/files/digest-paw-2.14.04-r1
index 1ce284629..0aa9794d9 100644
--- a/sci-physics/paw/files/digest-paw-2.14.04-r1
+++ b/sci-physics/paw/files/digest-paw-2.14.04-r1
@@ -1,6 +1,6 @@
-MD5 015c272bf8da386138920bafff7b2dc7 paw_2.14.04-6.diff.gz 61809
-RMD160 3bd1fadf938fff1af987e7d6b882ef6ba7a03a92 paw_2.14.04-6.diff.gz 61809
-SHA256 e40f8e9fa5a9683634eebf66fa51dc8307205e266584433edea74c32b1983972 paw_2.14.04-6.diff.gz 61809
+MD5 15666841ef53c50a72c5fe97b18ad48e paw_2.14.04-7.diff.gz 62407
+RMD160 01bd0b3b192097dc97b9d7e0f881e4fe016dddec paw_2.14.04-7.diff.gz 62407
+SHA256 9136791638cf1601388d786eb33d25a500c3babfc1508ac1a45f358eb9aba197 paw_2.14.04-7.diff.gz 62407
 MD5 b8732f47b32c73e7ad1a540e10c3c8cb paw_2.14.04.orig.tar.gz 3333012
 RMD160 5cf61384952bc1b9600a4ab04269f52eb342d5fc paw_2.14.04.orig.tar.gz 3333012
 SHA256 65c6cbb385c027c44197e0b63d8308283098323d7ba08377492c1b70c3158906 paw_2.14.04.orig.tar.gz 3333012
diff --git a/sci-physics/paw/files/digest-paw-2.14.04-r2 b/sci-physics/paw/files/digest-paw-2.14.04-r2
new file mode 100644
index 000000000..1b4fc5b5c
--- /dev/null
+++ b/sci-physics/paw/files/digest-paw-2.14.04-r2
@@ -0,0 +1,6 @@
+MD5 2dde98c3cbe839d07ce5dcb953f11b64 paw_2.14.04.dfsg-1.diff.gz 61966
+RMD160 f148424f02514527ba16e0123a4ad45fb7644178 paw_2.14.04.dfsg-1.diff.gz 61966
+SHA256 baa5a9f18ff0517993bbe783609cd57a2b1c26acac5564f508d7067165c98cbd paw_2.14.04.dfsg-1.diff.gz 61966
+MD5 2f1696c9cfe4940fa592c9d379e6a68b paw_2.14.04.dfsg.orig.tar.gz 3334350
+RMD160 8a5185ff765723e07da2437acc98ca2a8cb905b0 paw_2.14.04.dfsg.orig.tar.gz 3334350
+SHA256 b034a7b70e2e56ca114f34c427869338eed3ac12e8a28b5f8eef1e38dbbb676b paw_2.14.04.dfsg.orig.tar.gz 3334350
diff --git a/sci-physics/paw/metadata.xml b/sci-physics/paw/metadata.xml
index c5bdd620a..c3dd8b627 100644
--- a/sci-physics/paw/metadata.xml
+++ b/sci-physics/paw/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-physics</herd>
+<herd>sci-physics</herd>
+<longdescription lang="en">
+PAW is an interactive program providing interactive graphical
+presentation and statistical and mathematical analysis tools. It is
+designed to work on objects familiar to physicists such as histograms,
+event files (Ntuples), vectors, etc.
+The program is linked statically against the CERN libraries on 64-bit
+architectures in order to function properly, as its design is not very
+64-bit clean. Even so, AMD64 is the only 64-bit platform where it
+functions well.
+</longdescription>
 </pkgmetadata>
diff --git a/sci-physics/paw/paw-2.14.04-r1.ebuild b/sci-physics/paw/paw-2.14.04-r1.ebuild
index 925022db0..63b01978a 100644
--- a/sci-physics/paw/paw-2.14.04-r1.ebuild
+++ b/sci-physics/paw/paw-2.14.04-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 inherit eutils multilib fortran
 
 DEB_PV="${PV}"
-DEB_PR="6"
+DEB_PR="7"
 
 DESCRIPTION="CERN's Physics Analysis Workstation data analysis program"
 HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/paw/index.html"
@@ -15,7 +15,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${DEB_PV}.orig.tar.gz
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="sci-physics/cernlib"
+DEPEND="=sci-physics/cernlib-2005*"
 
 S=${WORKDIR}/${PN}-${DEB_PV}.orig
 
diff --git a/sci-physics/paw/paw-2.14.04-r2.ebuild b/sci-physics/paw/paw-2.14.04-r2.ebuild
new file mode 100644
index 000000000..350ed6dcb
--- /dev/null
+++ b/sci-physics/paw/paw-2.14.04-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils multilib fortran
+
+DEB_PV="${PV}.dfsg"
+DEB_PR="1"
+
+DESCRIPTION="CERN's Physics Analysis Workstation data analysis program"
+HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/paw/index.html"
+LICENSE="BSD"
+SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${DEB_PV}.orig.tar.gz
+	mirror://debian/pool/main/p/${PN}/${PN}_${DEB_PV}-${DEB_PR}.diff.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-libs/xbae
+	>=sci-physics/cernlib-2006"
+
+S=${WORKDIR}/${PN}_${DEB_PV}.orig
+
+FORTRAN="gfortran g77 ifc"
+
+src_unpack() {
+	fortran_src_unpack
+
+	cd "${WORKDIR}"
+	epatch ${PN}_${DEB_PV}-${DEB_PR}.diff || die "epatch failed"
+	mv ${PN}-${PV}.dfsg/debian "${S}"/
+	rm -rf ${PN}-${PV}.dfsg
+
+	cd "${S}"
+	cp debian/add-ons/Makefile .
+	# fix some path stuff and collision for comis.h, already installed by cernlib
+	sed -i \
+		-e "s:/usr/local:/usr:g" \
+		-e '/comis.h/d' \
+		-e "s/g77/${FORTRANC}/g" \
+		Makefile || die "sed failed"
+
+	einfo "Applying Debian patches"
+	make \
+		DEB_BUILD_OPTIONS="${FORTRANC} nostrip" \
+		patch &> /dev/null || die "make patch failed"
+}
+
+
+src_compile() {
+	emake -j1 DEB_BUILD_OPTIONS="${FORTRANC} nostrip" \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	cd "${S}"/debian
+	dodoc changelog README.* deadpool.txt copyright.txt
+	newdoc add-ons/README README.add-ons
+}