aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher (jlec) <jlec@j-schmitz.net>2009-08-17 16:37:15 +0200
committerJustin Lecher (jlec) <jlec@j-schmitz.net>2009-08-17 16:37:15 +0200
commit9d82695c5f4ab5437f78ff6c945edd48ad9130c3 (patch)
treeff738ba20e12fc6579ea8d86bca2955bd492d075 /x11-libs
parentx11-libs/libjwc_cfixed the fix (diff)
downloadsci-9d82695c5f4ab5437f78ff6c945edd48ad9130c3.tar.gz
sci-9d82695c5f4ab5437f78ff6c945edd48ad9130c3.tar.bz2
sci-9d82695c5f4ab5437f78ff6c945edd48ad9130c3.zip
x11-libs/libjwc_f add patch until ccp4 6.1.2
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/libjwc_f/ChangeLog8
-rw-r--r--x11-libs/libjwc_f/Manifest5
-rw-r--r--x11-libs/libjwc_f/files/612-gentoo.patch100
-rw-r--r--x11-libs/libjwc_f/libjwc_f-1.1-r1.ebuild (renamed from x11-libs/libjwc_f/libjwc_f-1.1.ebuild)5
4 files changed, 114 insertions, 4 deletions
diff --git a/x11-libs/libjwc_f/ChangeLog b/x11-libs/libjwc_f/ChangeLog
index cfbeea438..baf2ca0f1 100644
--- a/x11-libs/libjwc_f/ChangeLog
+++ b/x11-libs/libjwc_f/ChangeLog
@@ -1,7 +1,13 @@
-# ChangeLog for x11-libs/libjwc_c
+# ChangeLog for x11-libs/libjwc_f
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*libjwc_f-1.1-r1 (17 Aug 2009)
+
+ 17 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+ +files/612-gentoo.patch, -libjwc_f-1.1.ebuild, +libjwc_f-1.1-r1.ebuild:
+ add patch untill 6.1.2
+
*libjwc_f-1.1 (27 Feb 2009)
27 Feb 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> +metadata.xml,
diff --git a/x11-libs/libjwc_f/Manifest b/x11-libs/libjwc_f/Manifest
index f7dfbee7d..c039a1d69 100644
--- a/x11-libs/libjwc_f/Manifest
+++ b/x11-libs/libjwc_f/Manifest
@@ -1,4 +1,5 @@
+AUX 612-gentoo.patch 2779 RMD160 8ea985d29ed03a5d7106b8f475ba629d523dc62f SHA1 b62d1c805455e69add3d457f78bfb897ea1a3801 SHA256 1320119153eb08c7bba844c7c320d9d63758ba2d816ad61c11b5ca2c65ef975e
DIST libjwc_f-1.1.tar.gz 170973 RMD160 9fc0fc38aafa1611c13dfd963b903f4bd901e436 SHA1 f68c54e6062fec63f71eb612689626b4efc2e642 SHA256 9c05d5bac2a2e75d5fd490665c795ae31280da886e30f66cf39b3a32f2981199
-EBUILD libjwc_f-1.1.ebuild 531 RMD160 837ebfc23f32915267279f4a4f2dfc79704ce182 SHA1 870e0f0097d6e4f3dde1b37a60539c449364673e SHA256 4d5f297d09f5cdef02317d338a424dcf6e0b7a7eea76f5ace9847482cc9f3a9d
-MISC ChangeLog 262 RMD160 0fe9b6c465f11e9b1d81969f8746b0f70dd54736 SHA1 99780dc8d45f24b566c2ec525f142afda2c56ebd SHA256 7e8957eaaba0e16ea9784aae7d9b1d2602cda97eb8f9319a20e0325173ec5dc1
+EBUILD libjwc_f-1.1-r1.ebuild 595 RMD160 084d06f14bbfb4090a992c2f695ed7f6d922846b SHA1 51befdb2c75e300d2d779d6f066d4f9ee6f4f3eb SHA256 5f5ab6f049c7986a0c197c1ba8c3442a8cbb576aff392519e7ae6ee2287f2271
+MISC ChangeLog 451 RMD160 8b934a8e0b7ea5b482702e66ab255c9a1e0abd60 SHA1 9759c6d5d3a8886cd6012f1feeeb754dea07b838 SHA256 18506d0e0415a45ee58886b394db63d19cd4df25360f9d858b8febfc53531a62
MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
diff --git a/x11-libs/libjwc_f/files/612-gentoo.patch b/x11-libs/libjwc_f/files/612-gentoo.patch
new file mode 100644
index 000000000..e687d8bec
--- /dev/null
+++ b/x11-libs/libjwc_f/files/612-gentoo.patch
@@ -0,0 +1,100 @@
+diff -Nu libjwc_f-1.1/configure.in ccp4-6.1.2/x-windows/libjwc/libjwc_f/configure.in
+--- libjwc_f-1.1/configure.in 1999-10-21 16:07:14.000000000 +0200
++++ ccp4-6.1.2/x-windows/libjwc/libjwc_f/configure.in 2004-03-11 17:31:45.000000000 +0100
+@@ -8,6 +8,7 @@
+ AC_CANONICAL_SYSTEM
+
+ AM_INIT_AUTOMAKE(libjwc_f, 1.1)
++AM_MAINTAINER_MODE
+
+ case ${with_g77} in
+ "yes" ) CC="gcc" GCC=yes F77=g77 ;;
+@@ -17,7 +18,7 @@
+ AC_PROG_F77
+
+ AC_PROG_INSTALL
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+
+ case "$target" in
+ *irix6* )
+@@ -26,8 +27,9 @@
+ case "$FFLAGS" in
+ *-64* ) ;; # assume they meant it
+ *-o32* | *-32* ) ;; # presumably OK
+- * ) FFLAGS="$FFLAGS -o32 -O -g3"
+- CFLAGS=-32
++ *-n32* ) ;;
++ * ) FFLAGS="$FFLAGS -n32 -O -g3"
++ CFLAGS=-n32
+ AC_MSG_WARN([
+
+ *** Using compiler flag -o32 for probable compatibility with
+@@ -47,8 +49,33 @@
+ *** See the INSTALL file for more info.
+ ])
+ fi ;;
++ *linux* )
++ case $F77 in
++ g77*)
++ case "$FFLAGS" in
++ *no-second-underscore* ) ;; # presumably OK
++ * ) FFLAGS="$FFLAGS -fno-second-underscore -fno-globals" ;;
++ esac
++ esac ;;
++ *darwin* )
++ case $F77 in
++ g77*)
++ case "$FFLAGS" in
++ *no-second-underscore* ) ;; # presumably OK
++ * ) FFLAGS="$FFLAGS -fno-second-underscore -fno-globals" ;;
++ esac
++#mac g77 currently goes not handle -fno-common
++ enable_shared=no;
++ esac ;;
+ * )
+ esac
++# efc, version 7.1 at least does not support soname, so use CC
++case "$F77" in
++ *efc ) F77LD=${F77LD:-'${CC}'} ;;
++ * ) F77LD=${F77LD:-'${F77}'}
++esac
++
++AC_SUBST(F77LD)
+
+ AM_PROG_LIBTOOL
+
+Common subdirectories: libjwc_f-1.1/doc and ccp4-6.1.2/x-windows/libjwc/libjwc_f/doc
+diff -Nu libjwc_f-1.1/opn_scr.f ccp4-6.1.2/x-windows/libjwc/libjwc_f/opn_scr.f
+--- libjwc_f-1.1/opn_scr.f 1999-09-07 12:50:13.000000000 +0200
++++ ccp4-6.1.2/x-windows/libjwc/libjwc_f/opn_scr.f 2000-10-25 13:03:09.000000000 +0200
+@@ -16,6 +16,6 @@
+ C
+ C====== Open the file
+ C
+- OPEN (IUN_SCR, STATUS='SCRATCH')
+- RETURN
++C OPEN (IUN_SCR, STATUS='SCRATCH')
++ CALL CCPDPN(IUN_SCR,'JWCSCR','SCRATCH','U',0, IFAIL)
+ END
+diff -Nu libjwc_f-1.1/rpf_dstar.f ccp4-6.1.2/x-windows/libjwc/libjwc_f/rpf_dstar.f
+--- libjwc_f-1.1/rpf_dstar.f 1999-07-09 13:39:38.000000000 +0200
++++ ccp4-6.1.2/x-windows/libjwc/libjwc_f/rpf_dstar.f 2004-06-04 12:10:59.000000000 +0200
+@@ -376,7 +376,8 @@
+ INR_FLAG = 2
+ PHIW = 0.0
+ END IF
+- ELSE
++ RETURN
++ ENDIF
+ C
+ C---- Calculate distance of edge of spot from sphere at end of rotation
+ Crotgen.for
+@@ -418,7 +419,6 @@
+ INR_FLAG = 4
+ 40 RETURN
+ END IF
+- END IF
+ END IF
+ RETURN
+ END
diff --git a/x11-libs/libjwc_f/libjwc_f-1.1.ebuild b/x11-libs/libjwc_f/libjwc_f-1.1-r1.ebuild
index 9d5fb5453..8a55f5297 100644
--- a/x11-libs/libjwc_f/libjwc_f-1.1.ebuild
+++ b/x11-libs/libjwc_f/libjwc_f-1.1-r1.ebuild
@@ -4,10 +4,12 @@
EAPI="2"
-inherit fortran autotools
+inherit autotools eutils fortran
FORTRAN="g77 gfortran ifc"
+PATCH="612"
+
DESCRIPTION="additional c library for ccp4"
HOMEPAGE="http://www.ccp4.ac.uk/main.html"
SRC_URI="ftp://ftp.ccp4.ac.uk/jwc/${P}.tar.gz"
@@ -22,6 +24,7 @@ RDEPEND=""
DEPEND="${RDEPEND}"
src_prepare() {
+ epatch "${FILESDIR}"/${PATCH}-gentoo.patch
eautoreconf
}