now allow user' FFLAGS and added a src_test, should close bug #190534

Package-Manager: portage-2.1.2.12

6 files changed, 124 insertions, 13 deletions

diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog
index 6c3510d353da..963c85249b9e 100644
--- a/sci-physics/cernlib/ChangeLog
+++ b/sci-physics/cernlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/cernlib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.2 2007/08/28 14:33:45 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.3 2007/09/03 15:48:46 bicatali Exp $
+
+  03 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/cernlib-2006-maketest.patch, +files/cernlib-2006-test64.patch,
+  +files/cernlib-2006-testlink.patch, cernlib-2006.ebuild:
+  now allow user' FFLAGS and added a src_test. should close bug #190534.
 
   28 Aug 2007; Ferris McCormick <fmccor@gentoo.org> cernlib-2006.ebuild:
   Add ~sparc for testing (Bug #190163 comment 3) --- but please see Bug #190534
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index 2b16ef52ef4f..de95aa8c1af1 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -1,13 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX cernlib-2006-maketest.patch 461 RMD160 62080b73ccd9523d8920148a6fc56a5fad0a893e SHA1 3c22ac22e4a9f03b7ff8ae0516ce65edd6c36b2e SHA256 1a057d698237e778753a88f8b8b5a2168b9f998ce064c0669d145be6cbfc6613
+MD5 95e5e1dc6fdcbd40dd2e18c54a401f81 files/cernlib-2006-maketest.patch 461
+RMD160 62080b73ccd9523d8920148a6fc56a5fad0a893e files/cernlib-2006-maketest.patch 461
+SHA256 1a057d698237e778753a88f8b8b5a2168b9f998ce064c0669d145be6cbfc6613 files/cernlib-2006-maketest.patch 461
+AUX cernlib-2006-test64.patch 748 RMD160 70d59cd5185e5762bf7cf50ec2fb2042f7575326 SHA1 04e0cf5a98db90ed8d78363641090cad51b8d8d3 SHA256 863723f0051cb325d1e847166518d00778552225ef94ec7dea35b663337822be
+MD5 4253c30d7905045c4601bf9b15255e51 files/cernlib-2006-test64.patch 748
+RMD160 70d59cd5185e5762bf7cf50ec2fb2042f7575326 files/cernlib-2006-test64.patch 748
+SHA256 863723f0051cb325d1e847166518d00778552225ef94ec7dea35b663337822be files/cernlib-2006-test64.patch 748
+AUX cernlib-2006-testlink.patch 872 RMD160 be7a785e35181ff556804ef58362b8497d51066d SHA1 03f5a5db95c7322919f165d024ee33e2dfad1ba7 SHA256 6bab992e4d6a73ca0ab62aebba647b7193ae4bacf24b465408938295324bf128
+MD5 ced31fc13ca2a8c32db7b59789347b8e files/cernlib-2006-testlink.patch 872
+RMD160 be7a785e35181ff556804ef58362b8497d51066d files/cernlib-2006-testlink.patch 872
+SHA256 6bab992e4d6a73ca0ab62aebba647b7193ae4bacf24b465408938295324bf128 files/cernlib-2006-testlink.patch 872
 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.ebuild 3239 RMD160 730d5afb4e7105ecc36b8016fa78eaf770dda3a2 SHA1 a857e85ba6f7d075531cbf1d1621c12de4e2f1d7 SHA256 ce8f848e4c8e015643f78b2b6a6c3a551ff7216462750f7625bf6ce64fabbfb7
-MD5 23b7695d8b387672f38c3d0e8263c7e6 cernlib-2006.ebuild 3239
-RMD160 730d5afb4e7105ecc36b8016fa78eaf770dda3a2 cernlib-2006.ebuild 3239
-SHA256 ce8f848e4c8e015643f78b2b6a6c3a551ff7216462750f7625bf6ce64fabbfb7 cernlib-2006.ebuild 3239
-MISC ChangeLog 596 RMD160 defa776dd902599733224d2b17c28701118f3d63 SHA1 9c243b85d17300a8165c21fce351719e77e4f17d SHA256 7233f110a8b9681cf54f18384fe6b8e5675b8269d0a35cce0ba15e5c37c6c257
-MD5 2438061b9e9fdc218e8a7e76121f378a ChangeLog 596
-RMD160 defa776dd902599733224d2b17c28701118f3d63 ChangeLog 596
-SHA256 7233f110a8b9681cf54f18384fe6b8e5675b8269d0a35cce0ba15e5c37c6c257 ChangeLog 596
+EBUILD cernlib-2006.ebuild 3906 RMD160 9348afb2991d710f97a6030966d0a3f8b30c6478 SHA1 2741cf33b6c41502b9039b14458cf7bcd5888a67 SHA256 dccc26229adaa648cc8657a85e9def9d03091c29e43ec740f479e56911e80946
+MD5 6141e9c30bc7ec7698b418ebe151dcb1 cernlib-2006.ebuild 3906
+RMD160 9348afb2991d710f97a6030966d0a3f8b30c6478 cernlib-2006.ebuild 3906
+SHA256 dccc26229adaa648cc8657a85e9def9d03091c29e43ec740f479e56911e80946 cernlib-2006.ebuild 3906
+MISC ChangeLog 858 RMD160 74f4ca1e20f114b65d06e9a0ab0c9d804f4ce771 SHA1 250332f12d41a0a64de6b8daa9a6d5f6abde0885 SHA256 4d2e6b47cb84ef3d1eb7d370e0103578679a3d96504b241dc9fae05ee6099dbf
+MD5 c35725cfd07848e95d5a57876ef259ba ChangeLog 858
+RMD160 74f4ca1e20f114b65d06e9a0ab0c9d804f4ce771 ChangeLog 858
+SHA256 4d2e6b47cb84ef3d1eb7d370e0103578679a3d96504b241dc9fae05ee6099dbf ChangeLog 858
 MISC metadata.xml 654 RMD160 a33df2636030f2653d4bf478451979fc9850dc85 SHA1 7b018c6bb2eb2b897cd4a60b3a6080995094f44a SHA256 9812f051c9ac5c19fd295cdf79d9ba9d799a7b5ebe6b10d4cf9428d1ebf4e32c
 MD5 bfd8973f1748e907d0cc9f6af493c480 metadata.xml 654
 RMD160 a33df2636030f2653d4bf478451979fc9850dc85 metadata.xml 654
@@ -15,3 +30,10 @@ SHA256 9812f051c9ac5c19fd295cdf79d9ba9d799a7b5ebe6b10d4cf9428d1ebf4e32c metadata
 MD5 79f851b0e55de1fa9171f1899e3b2314 files/digest-cernlib-2006 545
 RMD160 94ceb0bb31819cd069ec50100198d25f50a54826 files/digest-cernlib-2006 545
 SHA256 28901345c90f52f3a076eb00c0206175f9a43efabdb75cc78aa373f59eda4019 files/digest-cernlib-2006 545
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFG3Czk1ycZbhPLE2ARAlyPAJ4rvls2PmSGmXH+WpEGCb+f/TVWTwCgngJ0
+tGwh0JzClGPz/LWbuljIY/Q=
+=bHmz
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/cernlib/cernlib-2006.ebuild b/sci-physics/cernlib/cernlib-2006.ebuild
index 9532b8ff1db7..5b4975b4ec2b 100644
--- a/sci-physics/cernlib/cernlib-2006.ebuild
+++ b/sci-physics/cernlib/cernlib-2006.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006.ebuild,v 1.3 2007/08/28 14:33:45 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006.ebuild,v 1.4 2007/09/03 15:48:46 bicatali Exp $
 
 inherit eutils multilib fortran
 
@@ -41,16 +41,17 @@ src_unpack() {
 	epatch "${DEB_P}-${DEB_PR}".diff
 
 	cd "${S}"
-	# temporary fix for threading support (might be supported by eselect)
+	# temporary fix for lapack libs (will need to change with new blas/lapack)
 	if eselect blas show | grep -q threaded-atlas; 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/' \
+			-e 's:-llapack-3:-llapack:g' \
 			debian/add-ons/bin/cernlib.in || die "sed failed"
 	fi
 
-	# fix X11 library path
+	# fix X11 library paths
 	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" \
@@ -85,7 +86,21 @@ src_unpack() {
 	# fix an ifort problem
 	sed -i \
 		-e 's/= $(CLIBS) -nofor_main/+= -nofor_main/' \
-		src/packlib/kuip/programs/kxterm/Imakefile || die "sed failed"
+		src/packlib/kuip/programs/kxterm/Imakefile || die "sed ifc failed"
+
+	# respect users flags
+	sed -i \
+		-e "s/-O3/-O2/g" \
+		-e "s/-O2/${CFLAGS}/g" \
+		src/config/linux.cf	|| die "sed linux.cf failed"
+
+	# fix tests
+	# this first one adds a test target on the common cernlib.mk for all cernlib packages
+	epatch "${FILESDIR}"/${P}-maketest.patch
+	# remove buggy tests on 64 bits arches
+	epatch "${FILESDIR}"/${P}-test64.patch
+	# fix linking of a few tests
+	epatch "${FILESDIR}"/${P}-testlink.patch
 }
 
 src_compile() {
@@ -94,6 +109,14 @@ src_compile() {
 		|| die "emake failed"
 }
 
+src_test() {
+	cd "${S}"
+	LD_LIBRARY_PATH="${S}"/shlib make \
+		TEST_PACKAGES="kernlib packlib mathlib graflib" \
+		DEB_BUILD_OPTIONS="${FORTRANC} nostrip" \
+		test || die "make test failed"
+}
+
 src_install() {
 	emake \
 		DEB_BUILD_OPTIONS="${FORTRANC} nostrip" \
diff --git a/sci-physics/cernlib/files/cernlib-2006-maketest.patch b/sci-physics/cernlib/files/cernlib-2006-maketest.patch
new file mode 100644
index 000000000000..268e2c605ca0
--- /dev/null
+++ b/sci-physics/cernlib/files/cernlib-2006-maketest.patch
@@ -0,0 +1,17 @@
+--- debian/add-ons/cernlib.mk.orig	2007-08-29 09:49:42.000000000 +0100
++++ debian/add-ons/cernlib.mk	2007-08-29 09:51:55.000000000 +0100
+@@ -185,6 +185,14 @@
+ 		fi ; \
+ 	done
+ 
++test: all
++	set -e ; \
++	for package in $(TEST_PACKAGES) ; do \
++		if [ -d $(CVSCOSRC)/$$package ] ; then \
++			cd $(CERN_BUILDDIR)/$$package && $(MAKE) test; \
++		fi ; \
++	done ; \
++
+ clean:
+ 	rm -rf stampdir src doc bin lib shlib build 200?
+ 	rm -f $(PATCHDIR)/9[0-9][0-9]*.dpatch
diff --git a/sci-physics/cernlib/files/cernlib-2006-test64.patch b/sci-physics/cernlib/files/cernlib-2006-test64.patch
new file mode 100644
index 000000000000..736997ad2ee9
--- /dev/null
+++ b/sci-physics/cernlib/files/cernlib-2006-test64.patch
@@ -0,0 +1,23 @@
+--- src/packlib/Imakefile.orig	2007-08-29 09:27:40.000000000 +0100
++++ src/packlib/Imakefile	2007-08-29 11:32:46.000000000 +0100
+@@ -16,7 +16,8 @@
+ InstallLibraryAlias(packlib,packlib-shift,$(CERN_LIBDIR))
+ InstallSharedLibrary(packlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
+ 
+-TestSubdirs($(LIBDIRS))
++/* removed buggy tests on 64 bits */
++TestSubdirs(cspack epio fatmen hepdb kapack minuit)
+ 
+ #ifdef CERNLIB_VAXVMS
+ 
+--- src/kernlib/Imakefile.orig	2007-08-29 09:27:40.000000000 +0100
++++ src/kernlib/Imakefile	2007-08-29 11:33:37.000000000 +0100
+@@ -18,6 +18,7 @@
+ 
+ test::	LibraryTargetName(kernlib)
+ 
+-TestSubdirs($(SUBDIRS))
++/* removed buggy files on 64 bits */
++TestSubdirs(kernbit kerngen umon)
+ 
+ InstallIncludeSubdirs($(LIBDIRS))
diff --git a/sci-physics/cernlib/files/cernlib-2006-testlink.patch b/sci-physics/cernlib/files/cernlib-2006-testlink.patch
new file mode 100644
index 000000000000..38318fa55f13
--- /dev/null
+++ b/sci-physics/cernlib/files/cernlib-2006-testlink.patch
@@ -0,0 +1,21 @@
+--- src/packlib/minuit/examples/Imakefile.orig	1997-10-23 18:04:15.000000000 +0100
++++ src/packlib/minuit/examples/Imakefile	2007-08-30 18:01:46.000000000 +0100
+@@ -9,6 +9,6 @@
+ FDEBUGFLAGS=NoOpFortranDebugFlags
+ #endif
+ 
+-CernlibFortranProgramTarget(minuit,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
++CernlibFortranProgramTarget(minuit,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+ 
+ TestTarget(minuit,NullParameter,NullParameter)
+--- src/mathlib/gen/tests/Imakefile.orig	2005-03-24 16:40:10.000000000 +0000
++++ src/mathlib/gen/tests/Imakefile	2007-08-30 18:09:04.000000000 +0100
+@@ -63,7 +63,7 @@
+ 
+ DefinePackageLibrary(gentest)
+ 
+-CernlibFortranProgramTarget(gent,main.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
++CernlibFortranProgramTarget(gent,main.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib packlib mathlib)
+ 
+ 
+ TestTarget(gent,NullParameter,NullParameter)