Revision bump to include new Debian patches and some ebuild cleanup

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

3 files changed, 48 insertions, 31 deletions

diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog
index 74a05e01ccd6..56dc356f7e33 100644
--- a/sci-physics/cernlib/ChangeLog
+++ b/sci-physics/cernlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/cernlib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.14 2009/03/22 21:51:54 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.15 2009/04/17 17:49:58 bicatali Exp $
+
+*cernlib-2006-r3 (17 Apr 2009)
+
+  17 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -cernlib-2006-r1.ebuild, +cernlib-2006-r3.ebuild:
+  Revision bump to include new Debian patches and some ebuild cleanup
 
   22 Mar 2009; Jeremy Olexa <darkside@gentoo.org> cernlib-2006-r2.ebuild:
   amd64 stable, bug 245875
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index 978c6a701617..379322247154 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -1,13 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cernlib-2006-maketest.patch 461 RMD160 62080b73ccd9523d8920148a6fc56a5fad0a893e SHA1 3c22ac22e4a9f03b7ff8ae0516ce65edd6c36b2e SHA256 1a057d698237e778753a88f8b8b5a2168b9f998ce064c0669d145be6cbfc6613
 AUX cernlib-2006-nogfortran.patch 1994 RMD160 dccb57e0b1d360080bc4527caef2beaa1225398d SHA1 10c32ccea93e78942afe5524b48dd47b4529ead8 SHA256 f9839ef5dc005715387bd997f69565aa1e5984502e6c6e625659e35bbaf9d997
 AUX cernlib-2006-test64.patch 748 RMD160 70d59cd5185e5762bf7cf50ec2fb2042f7575326 SHA1 04e0cf5a98db90ed8d78363641090cad51b8d8d3 SHA256 863723f0051cb325d1e847166518d00778552225ef94ec7dea35b663337822be
 AUX cernlib-2006-testlink.patch 872 RMD160 be7a785e35181ff556804ef58362b8497d51066d SHA1 03f5a5db95c7322919f165d024ee33e2dfad1ba7 SHA256 6bab992e4d6a73ca0ab62aebba647b7193ae4bacf24b465408938295324bf128
-DIST cernlib_2006.dfsg.2-11.diff.gz 187079 RMD160 cd87aeb1d9b16d2c2ab13d3a8883d1e01e61b31b SHA1 b9a7e09cc5794bfc464f3bd1cb8f2e1c949a0c72 SHA256 48d9e5df348e1dbf197bfeb11afe3408267f66a84bb3dcfbe263b5cb0a00bd91
 DIST cernlib_2006.dfsg.2-13.2.diff.gz 197806 RMD160 d00a2a60d14ffba01863d025aeb31962504849c8 SHA1 db0fea4208cd95d2e06b121607bdfafd15e8ad32 SHA256 fae32e8aa6cf77a11a7d86b8339a9a30e96b39cfefa6d93b9361f7942848b1ea
+DIST cernlib_2006.dfsg.2-14.diff.gz 191345 RMD160 e2c6180b76855b33eb637878157722803c046119 SHA1 1d3c1e5300227eda76ea41672d0dc1675003d578 SHA256 e58c84825ea6fc775acdbccbaaa7ac8c3b70120da8f99e704270ea0aa437e665
 DIST cernlib_2006.dfsg.2-2.diff.gz 167199 RMD160 2772f85fc4e8891e2729f57b35b24b1dd78de82d SHA1 ab4cf56fc7cd9bc2768a85128521a1b168c95ebe SHA256 40e2996e61f7b30dbedb1c525755a2e64df26e4878cce36f5f458229306dedb7
 DIST cernlib_2006.dfsg.2.orig.tar.gz 6152834 RMD160 a75f320a2568eb3942268e7b03525a045e324b70 SHA1 181fef4381d49a2e40a8f21550c3cef0dbaa4dd9 SHA256 f8ef612cdef0e02b69ccabbe0061eed5f952522565affc25e8ad6e0b73b73f26
-EBUILD cernlib-2006-r1.ebuild 2851 RMD160 2e50b8169f4f54032f9daf5ccd4c2221cdec1000 SHA1 b0bf6b6bae664249e212e277ec1fe73017573dcd SHA256 568271fa5f9e51a01fbbd36321ffeb6a8aab3979819b06d1261cea1db07297ec
 EBUILD cernlib-2006-r2.ebuild 3196 RMD160 229b7c3ccb6201ddfd2fb121f4b053d4e0671e29 SHA1 a16ca51dbdcc254f75c11c99a66d8add39cdfc28 SHA256 d992e1c575b167186cf40a6a56d01993a5ba74de3c24ae1072d3460778d396d5
+EBUILD cernlib-2006-r3.ebuild 3016 RMD160 e424aa50022aef45ee9645c36257023a6dbc7c03 SHA1 01fa108bf96da1c923b0a357a4685714c2b8f314 SHA256 b274c5acf4c668971029e294311fdc5df972f188fb1554136d211b6af7a550f0
 EBUILD cernlib-2006.ebuild 3918 RMD160 9dafabb7ef29efe9c71290476a78b0c6b84ac620 SHA1 7ab894926502460b3bf6ffe4ef5378dabc906ee7 SHA256 23f801963e9411fb6c22c8c95d3b506b0e36ae24df838fdc8e1835b98e6a8568
-MISC ChangeLog 2456 RMD160 735827d0dff92e558850f340ddd4786901565c7d SHA1 f9a1e6dfe417c81356af700a0ccce3581b66ad10 SHA256 3d1b931f2507668d00519601c074b5c89cd3e2bca09a94df44e66020c2549d8d
+MISC ChangeLog 2666 RMD160 121277d5236ebe7db0e6f6c065ab63a23ec0ad9d SHA1 21886058030203519ca85517152c58676eac77d6 SHA256 04fce858baa96ae3f177f29bae6200245f5380954f0ed453ad17a7c2d8f84b96
 MISC metadata.xml 654 RMD160 a33df2636030f2653d4bf478451979fc9850dc85 SHA1 7b018c6bb2eb2b897cd4a60b3a6080995094f44a SHA256 9812f051c9ac5c19fd295cdf79d9ba9d799a7b5ebe6b10d4cf9428d1ebf4e32c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknowU8ACgkQ1ycZbhPLE2CQ7ACeP6Yz25FUnrUeqspkLcs4ywd8
+yUoAoJcOGos/SiX6a1giEmvuQj46SQwa
+=sx7x
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/cernlib/cernlib-2006-r1.ebuild b/sci-physics/cernlib/cernlib-2006-r3.ebuild
index 0400d95fbdea..edcbd3fb4179 100644
--- a/sci-physics/cernlib/cernlib-2006-r1.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r3.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r1.ebuild,v 1.4 2008/06/27 10:39:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r3.ebuild,v 1.1 2009/04/17 17:49:58 bicatali Exp $
 
-inherit eutils multilib fortran
+EAPI=2
+inherit eutils toolchain-funcs
 
 DEB_PN=cernlib
 DEB_PV=${PV}.dfsg.2
-DEB_PR=11
+DEB_PR=14
 DEB_P=${DEB_PN}_${DEB_PV}
 
 DESCRIPTION="CERN program library for High Energy Physics"
@@ -19,31 +20,24 @@ LICENSE="GPL-2 LGPL-2 BSD"
 
 SLOT="0"
 
-DEPEND="x11-libs/openmotif
+RDEPEND="x11-libs/openmotif
 	virtual/lapack
-	virtual/latex-base
-	dev-lang/cfortran
+	dev-lang/cfortran"
+
+DEPEND="${RDEPEND}
 	x11-misc/imake
 	x11-misc/makedepend
 	dev-util/pkgconfig"
 
-RDEPEND="x11-libs/openmotif
-	virtual/lapack
-	dev-lang/cfortran"
-
 IUSE=""
 
 S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
 
-FORTRAN="gfortran g77 ifc"
-
-src_unpack() {
-
-	unpack ${A}
-	epatch "${DEB_P}-${DEB_PR}".diff
+src_prepare() {
+	cd "${WORKDIR}"
+	epatch "${WORKDIR}/${DEB_P}-${DEB_PR}.diff"
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-nogfortran.patch
-
+	epatch "${FILESDIR}/${P}-nogfortran.patch"
 	# set some default paths
 	sed -i \
 		-e "s:/usr/local:/usr:g" \
@@ -61,7 +55,7 @@ src_unpack() {
 		debian/add-ons/bin/cernlib.in || die "sed failed"
 
 	cp debian/add-ons/Makefile .
-	export DEB_BUILD_OPTIONS="${FORTRANC} nostrip nocheck"
+	export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"
 
 	einfo "Applying Debian patches"
 	emake -j1 patch || die "debian patch failed"
@@ -73,12 +67,23 @@ src_unpack() {
 	sed -i \
 		-e 's/-O3/-O2/g' \
 		-e "s/-O2/${CFLAGS}/g" \
-		src/config/linux.cf	|| die "sed linux.cf failed"
+		src/config/linux.cf	\
+		|| die "sed linux.cf failed"
+	sed -i \
+		-e 's/\$(FCLINK)/\$(FCLINK) $(LDFLAGS)/' \
+		-e 's/\$(CCLINK)/\$(CCLINK) $(LDFLAGS)/' \
+		src/config/{biglib,fortran,Imake}.rules \
+		src/patchy/Imakefile \
+		|| die "sed for ldflags propagation failed"
+
+	# add missing headers for implicit
+	sed -i \
+		-e '0,/^#include/i#include <stdlib.h>' \
+		src/kernlib/kerngen/ccgen*/*.c || die
 }
 
 src_compile() {
-	# create local LaTeX cache dir
-	mkdir -p .texmf-var
+	# parallel make breaks and complex patched imake system, hard to debug
 	emake -j1 cernlib-indep cernlib-arch || die "emake libs failed"
 }
 
@@ -99,8 +104,4 @@ pkg_postinst() {
 	elog "Serious cernlib users might want to check:"
 	elog "http://people.debian.org/~kmccarty/cernlib/"
 	elog "for the changes and licensing from the original package"
-	if use amd64; then
-		elog "Please see the possible warnings for ${PN} on 64 bits:"
-		elog "${ROOT}/usr/share/doc/${PF}/README.*64*"
-	fi
 }