Fixes for g77 to work, bug #213358

Package-Manager: portage-2.1.4.4

4 files changed, 71 insertions, 14 deletions

diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog
index 92db5bca5907..5c948d0636bb 100644
--- a/sci-physics/cernlib/ChangeLog
+++ b/sci-physics/cernlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/cernlib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.7 2008/03/11 12:09:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.8 2008/03/16 13:34:27 bicatali Exp $
+
+  16 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/cernlib-2006-nogfortran.patch, cernlib-2006-r1.ebuild:
+  Fixes for g77 to work, bug #213358
 
 *cernlib-2006-r1 (11 Mar 2008)
 
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index bfdd7caf7e50..0ea410b8c015 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -2,19 +2,20 @@
 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-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 2961 RMD160 d7feb9452ea4f233f36bfd811fea9eb9a27961e3 SHA1 f8cb53b0383f58c46f4379f4c27ceb6e49bc895f SHA256 6a8ff554bba1156c760216ba90f4045b2b1f6f4c5f5b6812919c53f36ec386df
+EBUILD cernlib-2006-r1.ebuild 2840 RMD160 7fc8e3bc7e2ad898f358de0e2413b50edcc6d538 SHA1 6d066e2c7b02e557a1bf20286617e748f58dc5e6 SHA256 46f4a1281847cd0dbd540039b8dc965e177d65d1dd182dc585505b19abe1af23
 EBUILD cernlib-2006.ebuild 3901 RMD160 1c6b254752beccd5a23fc608031db260cbf0d08d SHA1 f062ea34bb8a0819ce2829a8128afd191d88464a SHA256 3aeca7bc04db5870b9f4d92db76f9e080ba90b905c08e0d36fc6ed5193557ca8
-MISC ChangeLog 1425 RMD160 33115b1d2858fc3bbc4dc07b83fd7cddd7fafe73 SHA1 3eec7c948cedff83c581b4c9c49af7c4834777f8 SHA256 130f8c153ac2d727874d80b4c92ce0bdc18374f95d979249db2405f8d3ce1edf
+MISC ChangeLog 1582 RMD160 c02a494752bfd0d983b06d08006f1245c842d588 SHA1 398500552410b33d507e81e3f3391608abfe6a13 SHA256 dd537c14062f322eb4b44829f5b8242faf9c451a90538cb2f727c76f0331112d
 MISC metadata.xml 654 RMD160 a33df2636030f2653d4bf478451979fc9850dc85 SHA1 7b018c6bb2eb2b897cd4a60b3a6080995094f44a SHA256 9812f051c9ac5c19fd295cdf79d9ba9d799a7b5ebe6b10d4cf9428d1ebf4e32c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH1nZu1ycZbhPLE2ARAkp+AJ9218U1EkEeuX+q76ZeLpetDUUOFgCfWOww
-mBHSTtjq03bUOqLZSsnoMsY=
-=XBVt
+iD8DBQFH3SHs1ycZbhPLE2ARAvGIAJ4xOptrj8EzVNlSR+kGs5IPiGhvMgCcD3YV
+mw6SMmHL6Zb2ZZ/ZthWEMQQ=
+=BMnM
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/cernlib/cernlib-2006-r1.ebuild b/sci-physics/cernlib/cernlib-2006-r1.ebuild
index 346203b40f85..f456e903eaaa 100644
--- a/sci-physics/cernlib/cernlib-2006-r1.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.1 2008/03/11 12:09:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r1.ebuild,v 1.2 2008/03/16 13:34:27 bicatali Exp $
 
 inherit eutils multilib fortran
 
@@ -42,6 +42,7 @@ src_unpack() {
 	unpack ${A}
 	epatch "${DEB_P}-${DEB_PR}".diff
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-nogfortran.patch
 
 	# set some default paths
 	sed -i \
@@ -56,7 +57,7 @@ src_unpack() {
 		-e "s:\$DEPS -lm:$(pkg-config --libs blas):" \
 		-e "s:\$DEPS -llapack -lm:$(pkg-config --libs lapack):" \
 		-e 's:`depend $d $a blas`::' \
-		-e "s:X11R6:X11:g" \
+		-e 's:X11R6:X11:g' \
 		debian/add-ons/bin/cernlib.in || die "sed failed"
 
 	cp debian/add-ons/Makefile .
@@ -66,12 +67,7 @@ src_unpack() {
 	emake -j1 patch || die "debian patch failed"
 
 	# since we depend on cfortran, do not use the one from cernlib
-	rm -f src/include/cfortran/cfortran.h \
-
-	# fix an ifort problem
-	sed -i \
-		-e 's/= $(CLIBS) -nofor_main/:= $(CLIBS) -nofor_main/' \
-		src/packlib/kuip/programs/kxterm/Imakefile || die "sed ifc failed"
+	rm -f src/include/cfortran/cfortran.h
 
 	# respect users flags
 	sed -i \
diff --git a/sci-physics/cernlib/files/cernlib-2006-nogfortran.patch b/sci-physics/cernlib/files/cernlib-2006-nogfortran.patch
new file mode 100644
index 000000000000..63883274403f
--- /dev/null
+++ b/sci-physics/cernlib/files/cernlib-2006-nogfortran.patch
@@ -0,0 +1,56 @@
+--- debian/add-ons/Makefile.orig	2008-03-15 16:46:46.000000000 +0000
++++ debian/add-ons/Makefile	2008-03-15 16:47:51.000000000 +0000
+@@ -28,6 +28,9 @@
+ ifneq (,$(findstring ifort,$(DEB_BUILD_OPTIONS)))
+ 	sed -i -e 's/-lgfortran/-limf/' $(CERN_BINDIR)/cernlib
+ endif
++ifneq (,$(findstring g77,$(DEB_BUILD_OPTIONS)))
++	sed -i -e 's/-lgfortran/-lg2c/' $(CERN_BINDIR)/cernlib
++endif
+ 	chmod a+x $(CERN_BINDIR)/cernlib
+ 
+ # target to install include files for development packages
+--- debian/add-ons/cernlib.mk.orig	2008-03-15 16:48:05.000000000 +0000
++++ debian/add-ons/cernlib.mk	2008-03-15 17:09:14.000000000 +0000
+@@ -35,6 +35,10 @@
+ 	export TOOL_SONAME = _gfortran
+ 	export TOOL_NAME   = _gfortran
+ endif
++ifeq (,$(findstring g77,$(DEB_BUILD_OPTIONS)))
++	export TOOL_SONAME = _gfortran
++	export TOOL_NAME   = _gfortran
++endif
+ export PATH	   := $(CERN_BINDIR):$(ADDONDIR)/bin:$(datadir)/cernlib:${PATH}
+ export INSTALL_OPTS   ?= -s
+ export CC	      ?= gcc
+@@ -118,6 +122,8 @@
+ endif
+ ifneq (,$(findstring ifort,$(DEB_BUILD_OPTIONS)))
+ 	echo '#define HasIntelifc YES' >> $(CVSCOSRC)/config/host.def
++else ifneq (,$(findstring g77,$(DEB_BUILD_OPTIONS)))
++	echo  >> $(CVSCOSRC)/config/host.def
+ else
+ 	echo '#define Hasgfortran YES' >> $(CVSCOSRC)/config/host.def
+ endif
+--- debian/patches/320-support-ifort.dpatch.orig	2008-03-15 17:31:34.000000000 +0000
++++ debian/patches/320-support-ifort.dpatch	2008-03-15 17:31:56.000000000 +0000
+@@ -27,7 +27,7 @@
+  #if defined(CERNLIB_UNIX)
+  CLIBS= -G Motif kernlib
+ +# if defined(CERNLIB_INTELIFC)
+-+CLIBS= $(CLIBS) -nofor_main
+++CLIBS:= $(CLIBS) -nofor_main
+ +# endif
+  #endif
+  
+--- debian/patches/803-link-binaries-dynamically.dpatch.orig	2008-03-15 17:48:38.000000000 +0000
++++ debian/patches/803-link-binaries-dynamically.dpatch	2008-03-15 17:49:17.000000000 +0000
+@@ -64,7 +64,7 @@
+ -CLIBS= -G Motif kernlib
+ +CLIBS= -G Motif -u Xm
+  # if defined(CERNLIB_INTELIFC)
+- CLIBS= $(CLIBS) -nofor_main
++ CLIBS:= $(CLIBS) -nofor_main
+  # endif
+  #endif
+