paw: version bump

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@645 32389bae-6d03-0410-99cf-db05cde120eb

5 files changed, 31 insertions, 23 deletions

diff --git a/sci-physics/paw/ChangeLog b/sci-physics/paw/ChangeLog
index ed4c0f165..24d8165b4 100644
--- a/sci-physics/paw/ChangeLog
+++ b/sci-physics/paw/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*paw-2.14.04-r3 (04 Jun 2007)
+
+  04 Jun 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -paw-2.14.04-r2.ebuild, +paw-2.14.04-r3.ebuild:
+  Version bump, removed experimental version
+
+*paw-2.14.04-r2 (03 Apr 2007)
+
   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
diff --git a/sci-physics/paw/Manifest b/sci-physics/paw/Manifest
index 7f56a8a66..f2f6c5da2 100644
--- a/sci-physics/paw/Manifest
+++ b/sci-physics/paw/Manifest
@@ -1,17 +1,17 @@
-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
-EBUILD paw-2.14.04-r2.ebuild 686 RMD160 3c42d05656149a843620bb2e2da77f1e65e950fe SHA1 f0017c8327ae4847bcceb74b975114c5e8b7a59c SHA256 5b2bf99d441c6bf7fd19934c9d6e2292881c9d9f14c67b49bc7dacfedae7107a
-MD5 ab79b47d5712e9ff41dbb6154c0c6e55 paw-2.14.04-r2.ebuild 686
-RMD160 3c42d05656149a843620bb2e2da77f1e65e950fe paw-2.14.04-r2.ebuild 686
-SHA256 5b2bf99d441c6bf7fd19934c9d6e2292881c9d9f14c67b49bc7dacfedae7107a paw-2.14.04-r2.ebuild 686
-MISC ChangeLog 624 RMD160 8d45c91d4915a03c95241c4fce2ee0cee706c008 SHA1 dad0604196ea85809d2ec3478743ec2e75744128 SHA256 bd6d0634d13839b50363e0a8b235bb9447f72ce0001df2d12f2672f62eadc839
-MD5 b5e4706f709701e642b6080fff81a76c ChangeLog 624
-RMD160 8d45c91d4915a03c95241c4fce2ee0cee706c008 ChangeLog 624
-SHA256 bd6d0634d13839b50363e0a8b235bb9447f72ce0001df2d12f2672f62eadc839 ChangeLog 624
+DIST paw_2.14.04.dfsg.2-1.diff.gz 63690 RMD160 15714a33a7479a08007d48f74e71bdcfa8140ae6 SHA1 884d187babf64ac7da978affe3ede32e08cdf760 SHA256 db8fff53959799234ee56aec7b59897cf84e80c2c6438f7690c989eeea0dad2c
+DIST paw_2.14.04.dfsg.2.orig.tar.gz 3334317 RMD160 2dbe9f6800960981644f65c43e53bebf0d125cde SHA1 985ba7f567b7cfccc1d059f0b6011cae9ee36993 SHA256 68925384706a4a61c477a48ed0fad539d214a4b04fdb9db5ef4e8d453f26c44e
+EBUILD paw-2.14.04-r3.ebuild 631 RMD160 501e68bb8e7f94992f75f58e01da087c8af330f3 SHA1 8d5cebbf3b41a367f9e037fc99e22933bb41f101 SHA256 3dd002cf46d2f7f064e08b5685514508d6af2f6ecb1d262458206aa161dea0e7
+MD5 a2148ebbdf196bd1f8c5bbbe1f333360 paw-2.14.04-r3.ebuild 631
+RMD160 501e68bb8e7f94992f75f58e01da087c8af330f3 paw-2.14.04-r3.ebuild 631
+SHA256 3dd002cf46d2f7f064e08b5685514508d6af2f6ecb1d262458206aa161dea0e7 paw-2.14.04-r3.ebuild 631
+MISC ChangeLog 837 RMD160 97d411e23b080eb6fc47eb7bbde74b84ced20213 SHA1 799cd2b5343e4e52fe69bcc877a0e51f7bc455b6 SHA256 b4bef7d6483bf8386c73a315405952048898a277ff51a0761d8606a292995a6d
+MD5 d6d30a14025b221b8c72d173950b1e73 ChangeLog 837
+RMD160 97d411e23b080eb6fc47eb7bbde74b84ced20213 ChangeLog 837
+SHA256 b4bef7d6483bf8386c73a315405952048898a277ff51a0761d8606a292995a6d ChangeLog 837
 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 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
+MD5 55f4a1957fef5e375848d9c547e18ac5 files/digest-paw-2.14.04-r3 536
+RMD160 3412232f2b0e25d8b6dc9067f199e9d866d52a71 files/digest-paw-2.14.04-r3 536
+SHA256 d9531ac2aad4f4f40022ba827541053f90f2f5f2325285f14804d98a1c30dec6 files/digest-paw-2.14.04-r3 536
diff --git a/sci-physics/paw/files/digest-paw-2.14.04-r2 b/sci-physics/paw/files/digest-paw-2.14.04-r2
deleted file mode 100644
index 1b4fc5b5c..000000000
--- a/sci-physics/paw/files/digest-paw-2.14.04-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-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/files/digest-paw-2.14.04-r3 b/sci-physics/paw/files/digest-paw-2.14.04-r3
new file mode 100644
index 000000000..a1b9dbbe1
--- /dev/null
+++ b/sci-physics/paw/files/digest-paw-2.14.04-r3
@@ -0,0 +1,6 @@
+MD5 90982e80623338cf2d4b4a9efb445f8c paw_2.14.04.dfsg.2-1.diff.gz 63690
+RMD160 15714a33a7479a08007d48f74e71bdcfa8140ae6 paw_2.14.04.dfsg.2-1.diff.gz 63690
+SHA256 db8fff53959799234ee56aec7b59897cf84e80c2c6438f7690c989eeea0dad2c paw_2.14.04.dfsg.2-1.diff.gz 63690
+MD5 3549dee858a43ee671c8f42d40c1a741 paw_2.14.04.dfsg.2.orig.tar.gz 3334317
+RMD160 2dbe9f6800960981644f65c43e53bebf0d125cde paw_2.14.04.dfsg.2.orig.tar.gz 3334317
+SHA256 68925384706a4a61c477a48ed0fad539d214a4b04fdb9db5ef4e8d453f26c44e paw_2.14.04.dfsg.2.orig.tar.gz 3334317
diff --git a/sci-physics/paw/paw-2.14.04-r2.ebuild b/sci-physics/paw/paw-2.14.04-r3.ebuild
index b535a311b..12637a00c 100644
--- a/sci-physics/paw/paw-2.14.04-r2.ebuild
+++ b/sci-physics/paw/paw-2.14.04-r3.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+DEB_PV="${PV}.dfsg.2"
+DEB_PR="1"
 inherit cernlib
 
 DESCRIPTION="CERN's Physics Analysis Workstation data analysis program"
@@ -11,10 +13,8 @@ DEPEND="x11-libs/xbae"
 
 src_unpack() {
 	cernlib_unpack
-	# fix some path stuff and collision for comis.h, already installed by cernlib
-	# does not yet follow cernlib-06
-	mv "${WORKDIR}/${DEB_PN}_${DEB_PV}.orig" ${S}
-	mv "${WORKDIR}/${DEB_PN}-${DEB_PV}/debian" ${S}/
+	# fix some path stuff and collision for comis.h, 
+	# already installed by cernlib and replace hardcoded fortran compiler
 	sed -i \
 		-e '/comis.h/d' \
 		-e "s/g77/${FORTRANC}/g" \