cernlib: version bump+cleaning

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

19 files changed, 37 insertions, 337 deletions

diff --git a/sci-physics/cernlib-montecarlo/Manifest b/sci-physics/cernlib-montecarlo/Manifest
index 7ccb56d67..b5908416c 100644
--- a/sci-physics/cernlib-montecarlo/Manifest
+++ b/sci-physics/cernlib-montecarlo/Manifest
@@ -1,15 +1,9 @@
-DIST mclibs_2005.dfsg-2.diff.gz 34196 RMD160 1accd033972860469d2a99cf90950247e3898e30 SHA1 8042695f07336549a797cbfe8d837e677ed67e49 SHA256 e6e288ca52e59a52ae082b81313f89678ace345aaac074bfadef389a5f311c83
-DIST mclibs_2005.dfsg.orig.tar.gz 7405943 RMD160 570a2b22e97dbbb822fc2ca90a31c822c79e0e88 SHA1 a3cfadb08b872ab7533ebe3cd645a816f4d331b8 SHA256 f226ab973940684bf282738597a56f77a469cbb4d9889f101304ad13b1dc82e2
-DIST mclibs_2006.dfsg-1.diff.gz 33960 RMD160 5dea8ceb55f5cc16b8dc0722b73b85e09a1e3556 SHA1 1d764f95923430da872db44ef696d04cc91ae12d SHA256 994196912beb09095dd706a4a4697c40319d7f8fbf1ab7efa1fde8596eabc252
-DIST mclibs_2006.dfsg.orig.tar.gz 7406650 RMD160 f8e14a7af596b1db04ed11a607e878e3e14e1729 SHA1 b034ca8ff21af50f84799024ba07fc9efc88d4fc SHA256 17e6ab7f089052cce9ceb6ca165da4657b7a32e42c2139443e85ce21dbe062c2
-EBUILD cernlib-montecarlo-2005-r1.ebuild 1165 RMD160 d34a0770de06aa0f6543fb8c58131f4b229537d1 SHA1 4433dba01a3b38e77031948f0c464d899d53355b SHA256 bfd937b66b4c909f396a43e5582a510ca0d202b303cd802f30101763045e77ab
-MD5 98a7e4f8cd5755f8acaadd6845f6b041 cernlib-montecarlo-2005-r1.ebuild 1165
-RMD160 d34a0770de06aa0f6543fb8c58131f4b229537d1 cernlib-montecarlo-2005-r1.ebuild 1165
-SHA256 bfd937b66b4c909f396a43e5582a510ca0d202b303cd802f30101763045e77ab cernlib-montecarlo-2005-r1.ebuild 1165
-EBUILD cernlib-montecarlo-2006.ebuild 249 RMD160 808039ccf36eefd52c7cac078d091c59f1399e23 SHA1 98637613fd1955b89d48bcc5084403c564a03ee7 SHA256 ff4ffdffa5b14543fbe972aa5c5f277c6adb54a0f478e9fb23e9d7fb37d60fa9
-MD5 f32de69b8a2b69d65ca01a6ef9d2d1f7 cernlib-montecarlo-2006.ebuild 249
-RMD160 808039ccf36eefd52c7cac078d091c59f1399e23 cernlib-montecarlo-2006.ebuild 249
-SHA256 ff4ffdffa5b14543fbe972aa5c5f277c6adb54a0f478e9fb23e9d7fb37d60fa9 cernlib-montecarlo-2006.ebuild 249
+DIST mclibs_2006.dfsg.2-1.diff.gz 35476 RMD160 ab74f1a53c13aac8b7dd106911c74b7528f3efd4 SHA1 dd52a0c04ff20d5dcbb41f33735e9496ecff99c3 SHA256 9b323f66d089ddc4a115dca4856234ff8bd27cf19c8dff25a1265f0a26ddbfc6
+DIST mclibs_2006.dfsg.2.orig.tar.gz 7406559 RMD160 116bc443dafc299d66d0e83080c1b3b5b34d41b9 SHA1 4c86439750f0b0824bf2f58cf9f2dab810be5293 SHA256 8e73ccb987cb8f930ed44eac807d4f8fd5b03d6926b2f8d62ffb6b31806acf73
+EBUILD cernlib-montecarlo-2006-r1.ebuild 271 RMD160 df4b0609cc7d087c519f79bb4c4215f2c9ec42a9 SHA1 a836489fe98f0ada701421c095259b8f015c3c49 SHA256 6da0a35e1261d37a9ec2d29752120bd03930a270ddba4b099d786cd4c0df0201
+MD5 060fc312d61ca1ed47081bc741235b32 cernlib-montecarlo-2006-r1.ebuild 271
+RMD160 df4b0609cc7d087c519f79bb4c4215f2c9ec42a9 cernlib-montecarlo-2006-r1.ebuild 271
+SHA256 6da0a35e1261d37a9ec2d29752120bd03930a270ddba4b099d786cd4c0df0201 cernlib-montecarlo-2006-r1.ebuild 271
 MISC ChangeLog 623 RMD160 45c89b76830768284a24283eb5796f22bae9bf5b SHA1 bd20f1bb6c30261e449c77f53cf3a88d5f1d88b9 SHA256 05e51d09b7825fe18c7c5352d3a09ca85472921ba1d8b95ebbed4fec039d068a
 MD5 7e57bd56e7d7d9fd3f3dc795e74ef43f ChangeLog 623
 RMD160 45c89b76830768284a24283eb5796f22bae9bf5b ChangeLog 623
@@ -18,9 +12,6 @@ MISC metadata.xml 511 RMD160 292b53b5aa2511f561421a3496654c0bcdc75722 SHA1 8ed8a
 MD5 e27ccc1d3326f6c17c3a7ebe96d1a878 metadata.xml 511
 RMD160 292b53b5aa2511f561421a3496654c0bcdc75722 metadata.xml 511
 SHA256 60ad6466f80909bbb23d2a84fb177d2866a50efb0136553ba8d002d33f8c3dbf metadata.xml 511
-MD5 c654d7d4cdc5ad92e89791e88a1cf46d files/digest-cernlib-montecarlo-2005-r1 524
-RMD160 4dbe980f9bde8df828650ef3ceeb2a8046071c9d files/digest-cernlib-montecarlo-2005-r1 524
-SHA256 2ba01e3dddeb364094af66cc65f1686edffd1a548e7c412f15215fd60eb8c800 files/digest-cernlib-montecarlo-2005-r1 524
-MD5 b8b57dcb8321aa020667aae20fc03f33 files/digest-cernlib-montecarlo-2006 524
-RMD160 8ab3e1e6dbd211662d34a31a081707a9bcbde012 files/digest-cernlib-montecarlo-2006 524
-SHA256 9badfbcdbc7639e543fe5186d75b5e7c2b1d19100452dbb60fff3fbdb1a131c8 files/digest-cernlib-montecarlo-2006 524
+MD5 f8affb2b7f1e8977b72db27e20d64144 files/digest-cernlib-montecarlo-2006-r1 536
+RMD160 26f50f6e616233a1d2407deec70e3986a660a3dd files/digest-cernlib-montecarlo-2006-r1 536
+SHA256 00cc1d1c5c56c0bb98f454a02cc5d2f98e4b344945fe99901de2f024c560cf0c files/digest-cernlib-montecarlo-2006-r1 536
diff --git a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2005-r1.ebuild b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2005-r1.ebuild
deleted file mode 100644
index 6515fed20..000000000
--- a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2005-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils multilib fortran
-
-DEB_PN="mclibs"
-DEB_PV="${PV}.dfsg"
-DEB_PR="2"
-
-DESCRIPTION="Monte-carlo library and tools for the cernlib"
-HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/cernlib"
-LICENSE="GPL-2 LGPL-2"
-SRC_URI="mirror://debian/pool/main/m/${DEB_PN}/${DEB_PN}_${DEB_PV}.orig.tar.gz
-	mirror://debian/pool/main/m/${DEB_PN}/${DEB_PN}_${DEB_PV}-${DEB_PR}.diff.gz"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND="sci-physics/cernlib"
-
-S=${WORKDIR}/${DEB_PN}-${DEB_PV}.orig
-
-FORTRAN="g77"
-
-src_unpack() {
-	unpack ${A}
-
-	# apply the big debian patch
-	epatch ${DEB_PN}_${DEB_PV}-${DEB_PR}.diff || die "epatch failed"
-	cd "${S}"
-	cp debian/add-ons/Makefile .
-	sed -i \
-		-e "s:/usr/local:/usr:g" \
-		Makefile
-	einfo "Applying Debian patches"
-	make patch &> /dev/null || die "make patch failed"
-}
-
-src_compile() {
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	cd "${S}"/debian
-	docinto debian
-	dodoc changelog README.* deadpool.txt copyright
-	docinto debian/add-ons
-	dodoc add-ons/README
-}
diff --git a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006.ebuild b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r1.ebuild
index bfe0b0e45..d7e12f4ff 100644
--- a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006.ebuild
+++ b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r1.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 DEB_PN="mclibs"
+DEB_PV="${PV}.dfsg.2"
 DEB_PR="1"
 
 inherit cernlib
diff --git a/sci-physics/cernlib-montecarlo/files/digest-cernlib-montecarlo-2005-r1 b/sci-physics/cernlib-montecarlo/files/digest-cernlib-montecarlo-2005-r1
deleted file mode 100644
index 5be31065a..000000000
--- a/sci-physics/cernlib-montecarlo/files/digest-cernlib-montecarlo-2005-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 686eed0a828a6bfebb6c038526f2bb9f mclibs_2005.dfsg-2.diff.gz 34196
-RMD160 1accd033972860469d2a99cf90950247e3898e30 mclibs_2005.dfsg-2.diff.gz 34196
-SHA256 e6e288ca52e59a52ae082b81313f89678ace345aaac074bfadef389a5f311c83 mclibs_2005.dfsg-2.diff.gz 34196
-MD5 9f6c9713e9c13fc01b9c55ab49d5e6a9 mclibs_2005.dfsg.orig.tar.gz 7405943
-RMD160 570a2b22e97dbbb822fc2ca90a31c822c79e0e88 mclibs_2005.dfsg.orig.tar.gz 7405943
-SHA256 f226ab973940684bf282738597a56f77a469cbb4d9889f101304ad13b1dc82e2 mclibs_2005.dfsg.orig.tar.gz 7405943
diff --git a/sci-physics/cernlib-montecarlo/files/digest-cernlib-montecarlo-2006 b/sci-physics/cernlib-montecarlo/files/digest-cernlib-montecarlo-2006
deleted file mode 100644
index f4a837722..000000000
--- a/sci-physics/cernlib-montecarlo/files/digest-cernlib-montecarlo-2006
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1e654bb641c1a8af2ba655513665f936 mclibs_2006.dfsg-1.diff.gz 33960
-RMD160 5dea8ceb55f5cc16b8dc0722b73b85e09a1e3556 mclibs_2006.dfsg-1.diff.gz 33960
-SHA256 994196912beb09095dd706a4a4697c40319d7f8fbf1ab7efa1fde8596eabc252 mclibs_2006.dfsg-1.diff.gz 33960
-MD5 e47403b96a2f30f101dc389a271fb9d3 mclibs_2006.dfsg.orig.tar.gz 7406650
-RMD160 f8e14a7af596b1db04ed11a607e878e3e14e1729 mclibs_2006.dfsg.orig.tar.gz 7406650
-SHA256 17e6ab7f089052cce9ceb6ca165da4657b7a32e42c2139443e85ce21dbe062c2 mclibs_2006.dfsg.orig.tar.gz 7406650
diff --git a/sci-physics/cernlib-montecarlo/files/digest-cernlib-montecarlo-2006-r1 b/sci-physics/cernlib-montecarlo/files/digest-cernlib-montecarlo-2006-r1
new file mode 100644
index 000000000..94404b369
--- /dev/null
+++ b/sci-physics/cernlib-montecarlo/files/digest-cernlib-montecarlo-2006-r1
@@ -0,0 +1,6 @@
+MD5 3978b81499f205062b540aa58bb79193 mclibs_2006.dfsg.2-1.diff.gz 35476
+RMD160 ab74f1a53c13aac8b7dd106911c74b7528f3efd4 mclibs_2006.dfsg.2-1.diff.gz 35476
+SHA256 9b323f66d089ddc4a115dca4856234ff8bd27cf19c8dff25a1265f0a26ddbfc6 mclibs_2006.dfsg.2-1.diff.gz 35476
+MD5 140bde921ffa94b06bda51b57f609f36 mclibs_2006.dfsg.2.orig.tar.gz 7406559
+RMD160 116bc443dafc299d66d0e83080c1b3b5b34d41b9 mclibs_2006.dfsg.2.orig.tar.gz 7406559
+SHA256 8e73ccb987cb8f930ed44eac807d4f8fd5b03d6926b2f8d62ffb6b31806acf73 mclibs_2006.dfsg.2.orig.tar.gz 7406559
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index cd0d04d6d..48572c2a8 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -1,15 +1,9 @@
-DIST cernlib_2005.dfsg-5.diff.gz 165656 RMD160 b18bcafe23b58ada7a68c6bd57b32cfa706f123b SHA1 a03ee117ec7fd3e84923eb1c1b75492a027264ef SHA256 0ecca8163c003c795833a33e893c2a4e18d74ca0e3c81a3706800c6e9af66feb
-DIST cernlib_2005.dfsg.orig.tar.gz 6630738 RMD160 d1ae8cb2edb23c9e78fd621a04397b8986e6edc9 SHA1 d2f230ad45234123b269e4a855770a9814a1fff1 SHA256 67c5736312efec4969c22f071bbb1ba8f913baf2ba9a67b31a6972bd62960757
-DIST cernlib_2006.dfsg-1.diff.gz 164071 RMD160 2e3817e010399391d42a18aaa459211ef8056c26 SHA1 331a89c4ff1e438ab67da40aa5f8880f78a71914 SHA256 3f2bba276d1a9217dce1d9a08720152b145d44c295f994a5db01bc660f936c23
-DIST cernlib_2006.dfsg.orig.tar.gz 6152921 RMD160 349474eebc2e37c43ed552f0069bcafc2b13ba18 SHA1 3bf2f7d5a34c9fb7d629a08edb669b8714bc6249 SHA256 2e960ce2e85e50ebc476f2f1860a23a3a796537372b20a7b85e8f772d7611b22
-EBUILD cernlib-2005-r1.ebuild 2340 RMD160 cb564376c4e212c361edebb177a9ff8465111001 SHA1 f89379f45a3c5d858325ff2dad995e161363636c SHA256 e65214ee728a9f1c34e8e5c8fc3b90b120abebfd7879761f3a062acfee9b9045
-MD5 d6e01028fa9b9771bd4ea5865214ab5a cernlib-2005-r1.ebuild 2340
-RMD160 cb564376c4e212c361edebb177a9ff8465111001 cernlib-2005-r1.ebuild 2340
-SHA256 e65214ee728a9f1c34e8e5c8fc3b90b120abebfd7879761f3a062acfee9b9045 cernlib-2005-r1.ebuild 2340
-EBUILD cernlib-2006.ebuild 1087 RMD160 423c37c2e790ff087a8f3e0c87c9acc3f5c2b283 SHA1 276e6718d7f81c0e8c58484c032ba57da7a99797 SHA256 7c2ece17bcbd5900cc69edf13d058b753c7478ba42d5aea9d7faac6f13833261
-MD5 27111e7668df59e5fe0545c6a134589e cernlib-2006.ebuild 1087
-RMD160 423c37c2e790ff087a8f3e0c87c9acc3f5c2b283 cernlib-2006.ebuild 1087
-SHA256 7c2ece17bcbd5900cc69edf13d058b753c7478ba42d5aea9d7faac6f13833261 cernlib-2006.ebuild 1087
+DIST cernlib_2006.dfsg.2-1.diff.gz 167765 RMD160 cd221e847c74d6b6dd99f0539f100c658ddb0c92 SHA1 0f86399a91aac1e7eb16bb6d3b2e136d3313433f SHA256 998f56b39c844635922d3f5d3f1ddfbc48f04518b1520ec818ae2bf2fe997852
+DIST cernlib_2006.dfsg.2.orig.tar.gz 6152834 RMD160 a75f320a2568eb3942268e7b03525a045e324b70 SHA1 181fef4381d49a2e40a8f21550c3cef0dbaa4dd9 SHA256 f8ef612cdef0e02b69ccabbe0061eed5f952522565affc25e8ad6e0b73b73f26
+EBUILD cernlib-2006-r1.ebuild 1119 RMD160 1dea6557c0b8a460b1dc6229b02624416aba4374 SHA1 c6466e92b62403a25daa8c567c045550e7d7ec86 SHA256 4fa626a440f1618edf99975d361b311bbec79c31bda7f7cb4b53e69f44c2bc98
+MD5 4f867f25b5edcec5116a0f985c059214 cernlib-2006-r1.ebuild 1119
+RMD160 1dea6557c0b8a460b1dc6229b02624416aba4374 cernlib-2006-r1.ebuild 1119
+SHA256 4fa626a440f1618edf99975d361b311bbec79c31bda7f7cb4b53e69f44c2bc98 cernlib-2006-r1.ebuild 1119
 MISC ChangeLog 593 RMD160 6525fe9be805fd75cef3ca5ce982e1897e9229b6 SHA1 65e28efc3edeb7d4f6c294288a0c8d33b7e26657 SHA256 53c535a410d39397c8c67b389debf6d3a070223d8d3859463775e064f174027b
 MD5 9d0a413b6877eb33afae41d9376b91be ChangeLog 593
 RMD160 6525fe9be805fd75cef3ca5ce982e1897e9229b6 ChangeLog 593
@@ -18,9 +12,6 @@ MISC metadata.xml 654 RMD160 a33df2636030f2653d4bf478451979fc9850dc85 SHA1 7b018
 MD5 bfd8973f1748e907d0cc9f6af493c480 metadata.xml 654
 RMD160 a33df2636030f2653d4bf478451979fc9850dc85 metadata.xml 654
 SHA256 9812f051c9ac5c19fd295cdf79d9ba9d799a7b5ebe6b10d4cf9428d1ebf4e32c metadata.xml 654
-MD5 3cb72cac86715d4b708ce5b335b05ad9 files/digest-cernlib-2005-r1 533
-RMD160 ca79215b59b590de0c3c17fb45f0ac1268547207 files/digest-cernlib-2005-r1 533
-SHA256 0f7ba8a1a5f2a565c13ffe8ddda1780374aa32c0ce6d38335c35e07afaefac56 files/digest-cernlib-2005-r1 533
-MD5 7563d9b1f2c4036b9043fda9a514fb31 files/digest-cernlib-2006 533
-RMD160 71e43d4d3aa215e151602439c8e18243bcf54a2d files/digest-cernlib-2006 533
-SHA256 67213fa6db999f58a7777ddfed31eb28a03dd879b8eedf890711360481b1113a files/digest-cernlib-2006 533
+MD5 2b3f62466c5e2316b424d61d5dd91dc3 files/digest-cernlib-2006-r1 545
+RMD160 e074db8d58c85f0bf5b4774124e9a5f2cb66aee3 files/digest-cernlib-2006-r1 545
+SHA256 51e54cf1bbf9c7dbbf26ce9d6440df046cc6119a11db574c6f2460f1cdd9ade7 files/digest-cernlib-2006-r1 545
diff --git a/sci-physics/cernlib/cernlib-2005-r1.ebuild b/sci-physics/cernlib/cernlib-2005-r1.ebuild
deleted file mode 100644
index 6b25e4add..000000000
--- a/sci-physics/cernlib/cernlib-2005-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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="5"
-
-DESCRIPTION="CERN program library for High Energy Physics"
-HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/cernlib"
-LICENSE="GPL-2 LGPL-2"
-SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_PV}.orig.tar.gz
-	mirror://debian/pool/main/c/${PN}/${PN}_${DEB_PV}-${DEB_PR}.diff.gz"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND="virtual/motif
-	x11-misc/imake
-	app-admin/eselect-blas
-	virtual/lapack
-	dev-lang/cfortran
-	virtual/tetex"
-
-S=${WORKDIR}/${PN}-${DEB_PV}.orig
-
-FORTRAN="g77"
-
-src_unpack() {
-	unpack ${A}
-
-	# apply the big debian patch
-	epatch ${PN}_${DEB_PV}-${DEB_PR}.diff || die "epatch failed"
-
-	cd "${S}"
-
-	# temporary fix for threading support (while we have buggy eselect)
-	if eselect blas show | grep "atlas" | grep -q threaded; then
-		einfo "Fixing threads linking for blas"
-		sed -i \
-			-e 's/$DEPS -lm/$DEPS -lm -lpthread/' \
-			-e 's/$DEPS -l$1 -lm/$DEPS -l$1 -lm -lpthread/' \
-			debian/add-ons/bin/cernlib.in
-	fi
-
-	# fix X11 library path
-	sed -i \
-		-e "s:L/usr/X11R6/lib:L/usr/$(get_libdir)/X11:g" \
-		-e "s:XDIR=/usr/X11R6/lib:XDIR=/usr/$(get_libdir)/X11:g" \
-		-e "s:XDIR64=/usr/X11R6/lib:XDIR64=/usr/$(get_libdir)/X11:g" \
-		debian/add-ons/bin/cernlib.in
-
-	# fix some default paths
-	sed -i \
-		-e "s:/usr/local:/usr:g" \
-		-e "s:prefix)/lib:prefix)/$(get_libdir):" \
-		-e 's:$(prefix)/etc:/etc:' \
-		-e 's:$(prefix)/man:$(prefix)/share/man:' \
-		debian/add-ons/cernlib.mk
-
-	cp debian/add-ons/Makefile .
-	einfo "Applying Debian patches"
-	make patch &> /dev/null || die "make patch failed"
-	# since we depend on cfortran, do not use the one from cernlib
-	# (adapted from $S/debian/rules)
-	mv -f src/include/cfortran/cfortran.h \
-		src/include/cfortran/cfortran.h.disabled
-}
-
-
-src_compile() {
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	#einstall | die "einstall failed"
-	cd "${S}"/debian
-	docinto debian
-	dodoc changelog README.* deadpool.txt NEWS copyright
-	docinto debian/add-ons
-	dodoc add-ons/README
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Gentoo cernlib is based on Debian's one"
-	einfo "and respects file system standards, contrary"
-	einfo "to standard cernlib from cern"
-	einfo
-}
diff --git a/sci-physics/cernlib/cernlib-2006.ebuild b/sci-physics/cernlib/cernlib-2006-r1.ebuild
index 12e4199d9..130dbd78c 100644
--- a/sci-physics/cernlib/cernlib-2006.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r1.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+DEB_PV="${PV}.dfsg.2"
+DEB_PR="1"
 inherit cernlib
-
 DEPEND="app-admin/eselect-blas"
 KEYWORDS="~x86 ~amd64"
 
diff --git a/sci-physics/cernlib/files/digest-cernlib-2005-r1 b/sci-physics/cernlib/files/digest-cernlib-2005-r1
deleted file mode 100644
index cd8e99ca1..000000000
--- a/sci-physics/cernlib/files/digest-cernlib-2005-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d184eaf1a32bb49d0b1317fc30994ace cernlib_2005.dfsg-5.diff.gz 165656
-RMD160 b18bcafe23b58ada7a68c6bd57b32cfa706f123b cernlib_2005.dfsg-5.diff.gz 165656
-SHA256 0ecca8163c003c795833a33e893c2a4e18d74ca0e3c81a3706800c6e9af66feb cernlib_2005.dfsg-5.diff.gz 165656
-MD5 29268c75444e3c51442029c2eb46a78b cernlib_2005.dfsg.orig.tar.gz 6630738
-RMD160 d1ae8cb2edb23c9e78fd621a04397b8986e6edc9 cernlib_2005.dfsg.orig.tar.gz 6630738
-SHA256 67c5736312efec4969c22f071bbb1ba8f913baf2ba9a67b31a6972bd62960757 cernlib_2005.dfsg.orig.tar.gz 6630738
diff --git a/sci-physics/cernlib/files/digest-cernlib-2006 b/sci-physics/cernlib/files/digest-cernlib-2006
deleted file mode 100644
index 2fd460e33..000000000
--- a/sci-physics/cernlib/files/digest-cernlib-2006
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 51777e0bb52e104e3053615686f5a9be cernlib_2006.dfsg-1.diff.gz 164071
-RMD160 2e3817e010399391d42a18aaa459211ef8056c26 cernlib_2006.dfsg-1.diff.gz 164071
-SHA256 3f2bba276d1a9217dce1d9a08720152b145d44c295f994a5db01bc660f936c23 cernlib_2006.dfsg-1.diff.gz 164071
-MD5 757f06f37b9a1150cb918d6bc58fd775 cernlib_2006.dfsg.orig.tar.gz 6152921
-RMD160 349474eebc2e37c43ed552f0069bcafc2b13ba18 cernlib_2006.dfsg.orig.tar.gz 6152921
-SHA256 2e960ce2e85e50ebc476f2f1860a23a3a796537372b20a7b85e8f772d7611b22 cernlib_2006.dfsg.orig.tar.gz 6152921
diff --git a/sci-physics/cernlib/files/digest-cernlib-2006-r1 b/sci-physics/cernlib/files/digest-cernlib-2006-r1
new file mode 100644
index 000000000..78891c0db
--- /dev/null
+++ b/sci-physics/cernlib/files/digest-cernlib-2006-r1
@@ -0,0 +1,6 @@
+MD5 c68f372589cb39f734cad81a2a52c895 cernlib_2006.dfsg.2-1.diff.gz 167765
+RMD160 cd221e847c74d6b6dd99f0539f100c658ddb0c92 cernlib_2006.dfsg.2-1.diff.gz 167765
+SHA256 998f56b39c844635922d3f5d3f1ddfbc48f04518b1520ec818ae2bf2fe997852 cernlib_2006.dfsg.2-1.diff.gz 167765
+MD5 34be8a2775d8bfb96dcf4e7a1c0338fb cernlib_2006.dfsg.2.orig.tar.gz 6152834
+RMD160 a75f320a2568eb3942268e7b03525a045e324b70 cernlib_2006.dfsg.2.orig.tar.gz 6152834
+SHA256 f8ef612cdef0e02b69ccabbe0061eed5f952522565affc25e8ad6e0b73b73f26 cernlib_2006.dfsg.2.orig.tar.gz 6152834
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 56a46d463..0940c63ee 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,13 +1,9 @@
 DIST geant321_3.21.14.dfsg-4.diff.gz 36111 RMD160 eeadf11bcf8ae0bf21fff6203d521ef16ea29b78 SHA1 ec152a502f26058d8cf533e2be576d17433fcfa2 SHA256 e0c1261d2d196e8988332b87f76be37e2ecafec260772a31b3f5de38b7db0c3a
 DIST geant321_3.21.14.dfsg.orig.tar.gz 10922928 RMD160 253b35bd9cda82c2213ec042274f7e6ff6b9e333 SHA1 ae6f39ccc18eacd576a3493992db5da3b3d3b128 SHA256 186fe98a08ad1de39f68698a09a46e7c2f14c37b22f8f990257b0bd66215c5b4
-EBUILD geant-3.21.14-r1.ebuild 1232 RMD160 5558f1e8bb4ffede64b4719596e567e4f37cdf5d SHA1 63b4320b8574c6a48871a3b84fbd8c5dbe1163fc SHA256 34451b170ce46922ca58841480732acecab725ef8d5cf2926d4c8fce56538529
-MD5 0534c591c4e44eb424709e67476f4224 geant-3.21.14-r1.ebuild 1232
-RMD160 5558f1e8bb4ffede64b4719596e567e4f37cdf5d geant-3.21.14-r1.ebuild 1232
-SHA256 34451b170ce46922ca58841480732acecab725ef8d5cf2926d4c8fce56538529 geant-3.21.14-r1.ebuild 1232
-EBUILD geant-3.21.14-r2.ebuild 529 RMD160 6ee0fa3d84fe9e5303eae6854323d87583f7c0a0 SHA1 09bd4f0e57bab774cc22e3c915d22f7eb29b55bf SHA256 c062bb925178caa67219138ece28866efc4040406b81f302f0a73303d7d9ea99
-MD5 54d3e02b4495531783c1edee4bc38f80 geant-3.21.14-r2.ebuild 529
-RMD160 6ee0fa3d84fe9e5303eae6854323d87583f7c0a0 geant-3.21.14-r2.ebuild 529
-SHA256 c062bb925178caa67219138ece28866efc4040406b81f302f0a73303d7d9ea99 geant-3.21.14-r2.ebuild 529
+EBUILD geant-3.21.14-r2.ebuild 509 RMD160 4c1926e09f532baaceb34a81760cbb57b1f09b21 SHA1 f2c729b40bb573f22cc2c8e9ba556d142e915952 SHA256 58c8a0f22af98e01c626b6ae55865af8d5fe9a79d8918bc5f7b792ce84598cff
+MD5 1cae7264414ae83e734a5a93edaf0282 geant-3.21.14-r2.ebuild 509
+RMD160 4c1926e09f532baaceb34a81760cbb57b1f09b21 geant-3.21.14-r2.ebuild 509
+SHA256 58c8a0f22af98e01c626b6ae55865af8d5fe9a79d8918bc5f7b792ce84598cff geant-3.21.14-r2.ebuild 509
 MISC ChangeLog 359 RMD160 a62764b6202fdc0f5b9a964584fbcc02480f9e9c SHA1 54b85f34a07d78ad86676125c1074d1a9014aca9 SHA256 a20e797dae8ae7b308428c48209b2bcedfeddc67761349d6a0dfa8e70e89b860
 MD5 5e20b57a22ba97d8f83d575339646665 ChangeLog 359
 RMD160 a62764b6202fdc0f5b9a964584fbcc02480f9e9c ChangeLog 359
@@ -16,9 +12,6 @@ MISC metadata.xml 555 RMD160 a2023a5e29ced0c470a5d05dbf3ab554f30f5ea8 SHA1 56c44
 MD5 08556b4639a7cd6609f2a5869d8514b5 metadata.xml 555
 RMD160 a2023a5e29ced0c470a5d05dbf3ab554f30f5ea8 metadata.xml 555
 SHA256 fd010851cb7a2b58eecec4d1fed7cb6701aba960496e8224be545b3cc1f38ffe metadata.xml 555
-MD5 f084ad50b55464e0aaca8873c2950cc9 files/digest-geant-3.21.14-r1 557
-RMD160 1e58b1061e6ed3ce0cd1b05f12267359137071c4 files/digest-geant-3.21.14-r1 557
-SHA256 836d62024e6871f7d101d72e2f377d3d9b0dcf8d981b91dca9af3b837d7d403f files/digest-geant-3.21.14-r1 557
 MD5 f084ad50b55464e0aaca8873c2950cc9 files/digest-geant-3.21.14-r2 557
 RMD160 1e58b1061e6ed3ce0cd1b05f12267359137071c4 files/digest-geant-3.21.14-r2 557
 SHA256 836d62024e6871f7d101d72e2f377d3d9b0dcf8d981b91dca9af3b837d7d403f files/digest-geant-3.21.14-r2 557
diff --git a/sci-physics/geant/files/digest-geant-3.21.14-r1 b/sci-physics/geant/files/digest-geant-3.21.14-r1
deleted file mode 100644
index fd334b1c6..000000000
--- a/sci-physics/geant/files/digest-geant-3.21.14-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ebcc69212a164a9f32f6706c26262747 geant321_3.21.14.dfsg-4.diff.gz 36111
-RMD160 eeadf11bcf8ae0bf21fff6203d521ef16ea29b78 geant321_3.21.14.dfsg-4.diff.gz 36111
-SHA256 e0c1261d2d196e8988332b87f76be37e2ecafec260772a31b3f5de38b7db0c3a geant321_3.21.14.dfsg-4.diff.gz 36111
-MD5 8d98936888404f11f6854345495d1891 geant321_3.21.14.dfsg.orig.tar.gz 10922928
-RMD160 253b35bd9cda82c2213ec042274f7e6ff6b9e333 geant321_3.21.14.dfsg.orig.tar.gz 10922928
-SHA256 186fe98a08ad1de39f68698a09a46e7c2f14c37b22f8f990257b0bd66215c5b4 geant321_3.21.14.dfsg.orig.tar.gz 10922928
diff --git a/sci-physics/geant/geant-3.21.14-r1.ebuild b/sci-physics/geant/geant-3.21.14-r1.ebuild
deleted file mode 100644
index 96140df71..000000000
--- a/sci-physics/geant/geant-3.21.14-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils multilib fortran
-
-DEB_PN="${PN}321"
-DEB_PV="${PV}.dfsg"
-DEB_PR="4"
-
-DESCRIPTION="CERN's detector description and simulation Tool "
-HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/geant/index.html"
-LICENSE="GPL-2 LGPL-2"
-SRC_URI="mirror://debian/pool/main/g/${DEB_PN}/${DEB_PN}_${DEB_PV}.orig.tar.gz
-	mirror://debian/pool/main/g/${DEB_PN}/${DEB_PN}_${DEB_PV}-${DEB_PR}.diff.gz"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="=sci-physics/cernlib-2005*
-	sci-physics/paw"
-
-S=${WORKDIR}/${DEB_PN}-${DEB_PV}.orig
-
-FORTRAN="g77"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${DEB_PN}_${DEB_PV}-${DEB_PR}.diff
-	cd "${S}"
-	cp debian/add-ons/Makefile .
-	sed -i \
-		-e "s:/usr/local:/usr:g" \
-		Makefile || die "sed failed"
-	make \
-		DEB_BUILD_OPTIONS="nostrip" \
-		patch &> /dev/null || die "make patch failed"
-}
-
-src_compile() {
-	emake -j1 \
-		DEB_BUILD_OPTIONS="nostrip" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake \
-		DEB_BUILD_OPTIONS="nostrip" \
-		DESTDIR="${D}" \
-		install || die "emake install failed"
-	cd "${S}"/debian
-	dodoc changelog README.* deadpool.txt copyright
-	newdoc add-ons/README README.addons
-}
diff --git a/sci-physics/geant/geant-3.21.14-r2.ebuild b/sci-physics/geant/geant-3.21.14-r2.ebuild
index 3fb503605..7576133bb 100644
--- a/sci-physics/geant/geant-3.21.14-r2.ebuild
+++ b/sci-physics/geant/geant-3.21.14-r2.ebuild
@@ -3,7 +3,6 @@
 # $Header: $
 
 DEB_PN="${PN}321"
-DEB_PV="${PV}.dfsg"
 DEB_PR="4"
 
 inherit cernlib
diff --git a/sci-physics/paw/Manifest b/sci-physics/paw/Manifest
index 7cf68c9b7..c73ccc178 100644
--- a/sci-physics/paw/Manifest
+++ b/sci-physics/paw/Manifest
@@ -1,11 +1,5 @@
-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 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 555 RMD160 8894df9de767b192a12c08190634af164711f0c1 SHA1 429852393a51f432146178762751baa72c5f6a89 SHA256 360055ee15d9aa7e9b6293f6920db943155dc544ad4e12e18e6a1fc42cca5fce
 MD5 0380c2489172c54c89378c85e4ab7ed3 paw-2.14.04-r2.ebuild 555
 RMD160 8894df9de767b192a12c08190634af164711f0c1 paw-2.14.04-r2.ebuild 555
@@ -18,9 +12,6 @@ MISC metadata.xml 672 RMD160 b58513a2dcf581528ec21a29a35ba9ba2cbe52a8 SHA1 4e981
 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
deleted file mode 100644
index 0aa9794d9..000000000
--- a/sci-physics/paw/files/digest-paw-2.14.04-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-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/paw-2.14.04-r1.ebuild b/sci-physics/paw/paw-2.14.04-r1.ebuild
deleted file mode 100644
index 63b01978a..000000000
--- a/sci-physics/paw/paw-2.14.04-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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="7"
-
-DESCRIPTION="CERN's Physics Analysis Workstation data analysis program"
-HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/paw/index.html"
-LICENSE="GPL-2 LGPL-2"
-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="=sci-physics/cernlib-2005*"
-
-S=${WORKDIR}/${PN}-${DEB_PV}.orig
-
-FORTRAN="g77"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${PN}_${DEB_PV}-${DEB_PR}.diff || die "epatch failed"
-	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' \
-		Makefile
-
-	einfo "Applying Debian patches"
-	make patch &> /dev/null || die "make patch failed"
-}
-
-
-src_compile() {
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	cd "${S}"/debian
-	docinto debian
-	dodoc changelog README.* deadpool.txt copyright
-	docinto debian/add-ons
-	dodoc add-ons/README
-}