cernlib now uses the cernlib.eclass

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

3 files changed, 15 insertions, 72 deletions

diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index f7fce20d7..708232337 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -2,14 +2,14 @@ DIST cernlib_2005.dfsg-5.diff.gz 165656 RMD160 b18bcafe23b58ada7a68c6bd57b32cfa7
 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 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-2006.ebuild 2656 RMD160 5337d9e302a138f3ced69267636a58b182c19525 SHA1 8fa0d4acaadcfda2dd398dad6561b85e75bead86 SHA256 96040541fbdc84788b540edb1facb3b4debcfa571f9ed826b2a09bb3267c730f
-MD5 ce64ead2e99b47e8f7839acd86316e90 cernlib-2006.ebuild 2656
-RMD160 5337d9e302a138f3ced69267636a58b182c19525 cernlib-2006.ebuild 2656
-SHA256 96040541fbdc84788b540edb1facb3b4debcfa571f9ed826b2a09bb3267c730f cernlib-2006.ebuild 2656
+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 1064 RMD160 0ca578ffe2d1c3d267f8a2ce9d85d9264466720b SHA1 0d4d0d8eb0f8a68f25cd4d8ecdadb22dfafb1453 SHA256 df92b0fea7560f10e439bf2310e828242e3f3caacd0c76148f6a7db7f0056939
+MD5 3aa93a675e09440395220031b4080f9d cernlib-2006.ebuild 1064
+RMD160 0ca578ffe2d1c3d267f8a2ce9d85d9264466720b cernlib-2006.ebuild 1064
+SHA256 df92b0fea7560f10e439bf2310e828242e3f3caacd0c76148f6a7db7f0056939 cernlib-2006.ebuild 1064
 MISC ChangeLog 593 RMD160 6525fe9be805fd75cef3ca5ce982e1897e9229b6 SHA1 65e28efc3edeb7d4f6c294288a0c8d33b7e26657 SHA256 53c535a410d39397c8c67b389debf6d3a070223d8d3859463775e064f174027b
 MD5 9d0a413b6877eb33afae41d9376b91be ChangeLog 593
 RMD160 6525fe9be805fd75cef3ca5ce982e1897e9229b6 ChangeLog 593
diff --git a/sci-physics/cernlib/cernlib-2005-r1.ebuild b/sci-physics/cernlib/cernlib-2005-r1.ebuild
index 39bfc6a09..6b25e4add 100644
--- a/sci-physics/cernlib/cernlib-2005-r1.ebuild
+++ b/sci-physics/cernlib/cernlib-2005-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/sci-physics/cernlib/cernlib-2006.ebuild b/sci-physics/cernlib/cernlib-2006.ebuild
index 769510489..fb310bbf4 100644
--- a/sci-physics/cernlib/cernlib-2006.ebuild
+++ b/sci-physics/cernlib/cernlib-2006.ebuild
@@ -2,43 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils multilib fortran
+inherit cernlib
 
-DEB_PV="${PV}.dfsg"
-DEB_PR="1"
-
-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"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${PN}_${DEB_PV}.orig
-
-FORTRAN="gfortran g77 ifc"
+DEPEND="app-admin/eselect-blas"
 
 src_unpack() {
-	fortran_src_unpack ${A}
-	cd "${WORKDIR}"
-
-	# apply the big debian patch
-	epatch "${PN}_${DEB_PV}-${DEB_PR}".diff || die "epatch failed"
-	mv ${PN}-${PV}.dfsg/debian "${S}"/
-	rm -rf ${PN}-${PV}.dfsg
-
+	cernlib_unpack
 	cd "${S}"
-
-	# temporary fix for threading support (while we have buggy eselect)
+	# temporary fix for threading support (might be supported by eselect)
 	if eselect blas show | grep -q threaded-atlas; then
 		einfo "Fixing threads linking for blas"
 		sed -i \
@@ -47,7 +18,7 @@ src_unpack() {
 			debian/add-ons/bin/cernlib.in || die "sed failed"
 	fi
 
-	# fix X11 library path and fortran stuff
+	# 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" \
@@ -62,33 +33,5 @@ src_unpack() {
 		-e 's:$(prefix)/man:$(prefix)/share/man:' \
 		debian/add-ons/cernlib.mk || die "sed failed"
 
-	cp debian/add-ons/Makefile .
-	einfo "Applying Debian patches"
-	make \
-		DEB_BUILD_OPTIONS="${FORTRANC} nostrip" \
-		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() {
-	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 NEWS copyright
-	newdoc add-ons/README README.add-ons
-}
-
-pkg_postinst() {
-	elog "Gentoo cernlib is based on Debian's one:"
-	elog " - apply a significant amount of patches"
-	elog " - respects file system standards"
-	elog "Heavy cernlib users might want to check:"
-	elog "http://people.debian.org/~kmccarty/cernlib/"
+	cernlib_patch
 }