cernlib-2005-r1: updated patches

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

4 files changed, 116 insertions, 4 deletions

diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog
index baf1ad348..37ebcd2e8 100644
--- a/sci-physics/cernlib/ChangeLog
+++ b/sci-physics/cernlib/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cernlib-2005-r1 (15 Oct 2006)
+
+  15 Oct 2006; Sebastien Fabbro <seb@ist.utl.pt> 
+  +cernlib-2005-r1.ebuild
+  Updated to new debian patches. Now use eselect-blas, and 
+  removed ifc support for now.
+	
+	
 *cernlib-2005 (12 Sep 2006)
 
   12 Sep 2006; Sebastien Fabbro <seb@ist.utl.pt> 
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index 02d5c1e96..9fa64a8c6 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -1,13 +1,18 @@
 DIST cernlib_2005.dfsg-3.diff.gz 164972 RMD160 6adf9450934c1b9a46cfe114b480d519c99318f7 SHA1 142d69d68deee0fe87b701e131d84ca519444ede SHA256 13fb2bceae16123164114be33bc436a30e42dbd6e54f773165ca3d64032b0cbc
+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
+EBUILD cernlib-2005-r1.ebuild 2340 RMD160 2f81f9b0d5b2ee1884a9a255c86dc5ee8f31c819 SHA1 0b8ef688c73c698520ff88ed832e5534c912bd1a SHA256 61621e47d371a36d818de4f7ac7edd9843ad304c6750d518a2c35892d1ad77fd
+MD5 220620746ca5a52348f279810afa79a0 cernlib-2005-r1.ebuild 2340
+RMD160 2f81f9b0d5b2ee1884a9a255c86dc5ee8f31c819 cernlib-2005-r1.ebuild 2340
+SHA256 61621e47d371a36d818de4f7ac7edd9843ad304c6750d518a2c35892d1ad77fd cernlib-2005-r1.ebuild 2340
 EBUILD cernlib-2005.ebuild 2414 RMD160 3bf5d3ee0c87e5d241ea0f68bfbc5b9ceedee3c0 SHA1 e111b790503a12a7b0fe044e12a62c880ea424bc SHA256 b858c3f1437ca263ac8c0f77854b1bf820baecc9f09ef86711fbc97cc557b337
 MD5 6397495990347a0286d20bf9626e551b cernlib-2005.ebuild 2414
 RMD160 3bf5d3ee0c87e5d241ea0f68bfbc5b9ceedee3c0 cernlib-2005.ebuild 2414
 SHA256 b858c3f1437ca263ac8c0f77854b1bf820baecc9f09ef86711fbc97cc557b337 cernlib-2005.ebuild 2414
-MISC ChangeLog 296 RMD160 1f5ee1386da20d66261fb793b739b64bc0b1cca0 SHA1 6738dac11bb14e01790ec706d51e4d27f98676fe SHA256 82eb36223bd24daeed543bfc5c478ad788e24d6d8b955dc589e91a3ad409c3e6
-MD5 a23c8f17ca6667d4bfb353c2de1c0467 ChangeLog 296
-RMD160 1f5ee1386da20d66261fb793b739b64bc0b1cca0 ChangeLog 296
-SHA256 82eb36223bd24daeed543bfc5c478ad788e24d6d8b955dc589e91a3ad409c3e6 ChangeLog 296
+MISC ChangeLog 499 RMD160 23be8787fdb5574f4612d7019634f95e231bc113 SHA1 1437aaa124a1fd662b6e2aa4d58abdb887cf129f SHA256 6cc427940a4ba57c1a6d4135ec30f4e2b4e7acaa0a432e7a018caf0a86df8b8e
+MD5 7c98c4129645adfbe9550765acce553e ChangeLog 499
+RMD160 23be8787fdb5574f4612d7019634f95e231bc113 ChangeLog 499
+SHA256 6cc427940a4ba57c1a6d4135ec30f4e2b4e7acaa0a432e7a018caf0a86df8b8e ChangeLog 499
 MISC metadata.xml 760 RMD160 a4077e671340fa26d98b92de09e4a6f50b3d2199 SHA1 4d7a00c8521f46ab10f055c7102b87b18fdc4a2c SHA256 d1f0a3c5915764e8b9bd55ed62f4c3e85bdc912864f430dcf304f4b731964669
 MD5 140fd98c0e6f3bcba4d683be42a9505c metadata.xml 760
 RMD160 a4077e671340fa26d98b92de09e4a6f50b3d2199 metadata.xml 760
@@ -15,3 +20,6 @@ SHA256 d1f0a3c5915764e8b9bd55ed62f4c3e85bdc912864f430dcf304f4b731964669 metadata
 MD5 1533c4f93cab68693e5337e602dc547f files/digest-cernlib-2005 533
 RMD160 187cadc26d38e0c669bd5153c19d41c9be687dc4 files/digest-cernlib-2005 533
 SHA256 c5c9993b293243df62f8a807208e72c4789eab52e42b3557d68b1e54b8023fff files/digest-cernlib-2005 533
+MD5 3cb72cac86715d4b708ce5b335b05ad9 files/digest-cernlib-2005-r1 533
+RMD160 ca79215b59b590de0c3c17fb45f0ac1268547207 files/digest-cernlib-2005-r1 533
+SHA256 0f7ba8a1a5f2a565c13ffe8ddda1780374aa32c0ce6d38335c35e07afaefac56 files/digest-cernlib-2005-r1 533
diff --git a/sci-physics/cernlib/cernlib-2005-r1.ebuild b/sci-physics/cernlib/cernlib-2005-r1.ebuild
new file mode 100644
index 000000000..39bfc6a09
--- /dev/null
+++ b/sci-physics/cernlib/cernlib-2005-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2006 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/files/digest-cernlib-2005-r1 b/sci-physics/cernlib/files/digest-cernlib-2005-r1
new file mode 100644
index 000000000..cd8e99ca1
--- /dev/null
+++ b/sci-physics/cernlib/files/digest-cernlib-2005-r1
@@ -0,0 +1,6 @@
+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