From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id ECD4D1381F3 for ; Sun, 2 Jun 2013 13:43:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA6F1E09E8; Sun, 2 Jun 2013 13:43:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 56511E09E8 for ; Sun, 2 Jun 2013 13:43:14 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D8BFC33E369 for ; Sun, 2 Jun 2013 13:43:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 70D61E545C for ; Sun, 2 Jun 2013 13:43:09 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1370170865.083de4d1d6e0f50ee4a625a9860e8fbef736eb92.jlec@gentoo> Subject: [gentoo-commits] proj/sci:ccp4 commit in: dev-libs/libjwc_f/files/, dev-libs/libjwc_f/ X-VCS-Repository: proj/sci X-VCS-Files: dev-libs/libjwc_f/ChangeLog dev-libs/libjwc_f/files/612-gentoo.patch dev-libs/libjwc_f/files/libjwc_f-1.1-else.patch dev-libs/libjwc_f/libjwc_f-1.1-r3.ebuild dev-libs/libjwc_f/metadata.xml X-VCS-Directories: dev-libs/libjwc_f/files/ dev-libs/libjwc_f/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 083de4d1d6e0f50ee4a625a9860e8fbef736eb92 X-VCS-Branch: ccp4 Date: Sun, 2 Jun 2013 13:43:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f10936af-55fe-458c-960c-f0f35566cde8 X-Archives-Hash: 6812be2a616489620bb1ed0171d3e63e commit: 083de4d1d6e0f50ee4a625a9860e8fbef736eb92 Author: Justin Lecher gentoo org> AuthorDate: Sun Jun 2 11:01:05 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sun Jun 2 11:01:05 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=083de4d1 dev-libs/libjwc_f: Import patch from 6.3.0 Package-Manager: portage-2.2.0_alpha177 --- dev-libs/libjwc_f/ChangeLog | 66 ++++++++++++++++ dev-libs/libjwc_f/files/612-gentoo.patch | 100 ++++++++++++++++++++++++ dev-libs/libjwc_f/files/libjwc_f-1.1-else.patch | 20 +++++ dev-libs/libjwc_f/libjwc_f-1.1-r3.ebuild | 42 ++++++++++ dev-libs/libjwc_f/metadata.xml | 8 ++ 5 files changed, 236 insertions(+) diff --git a/dev-libs/libjwc_f/ChangeLog b/dev-libs/libjwc_f/ChangeLog new file mode 100644 index 0000000..bcd7ef0 --- /dev/null +++ b/dev-libs/libjwc_f/ChangeLog @@ -0,0 +1,66 @@ +# ChangeLog for dev-libs/libjwc_f +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libjwc_f/ChangeLog,v 1.15 2012/10/19 10:32:13 jlec Exp $ + +*libjwc_f-1.1-r3 (02 Jun 2013) + + 02 Jun 2013; Justin Lecher +libjwc_f-1.1-r3.ebuild, + +files/612-gentoo.patch, +files/libjwc_f-1.1-else.patch, +metadata.xml: + Import patch from 6.3.0 + + 19 Oct 2012; Justin Lecher libjwc_f-1.1-r2.ebuild: + Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the + updated fortran-2.eclass + + 26 Aug 2012; Justin Lecher -libjwc_f-1.1-r1.ebuild: + Drop old + + 20 Aug 2012; Johannes Huber libjwc_f-1.1-r2.ebuild: + Stable for x86, wrt bug #428962 + + 11 Aug 2012; Agostino Sarubbo libjwc_f-1.1-r2.ebuild: + Stable for amd64, wrt bug #428962 + + 30 May 2012; Justin Lecher libjwc_f-1.1-r2.ebuild: + Drop missing script + +*libjwc_f-1.1-r2 (30 May 2012) + + 30 May 2012; Justin Lecher +libjwc_f-1.1-r2.ebuild, + metadata.xml: + Move to EAPI=4, fix underlinking, handle static-libs + + 21 Jun 2011; Justin Lecher libjwc_f-1.1-r1.ebuild: + Add dependency on virtual/fortran + + 21 Jun 2011; Justin Lecher libjwc_f-1.1-r1.ebuild: + Added fortran-2.eclass support + + 23 Jan 2011; Thomas Kahle libjwc_f-1.1-r1.ebuild: + x86 stable per bug 351768 + + 18 Jan 2011; Markos Chandras libjwc_f-1.1-r1.ebuild: + Stable on amd64 wrt bug #351768 + + 16 Jan 2011; Kacper Kowalik + libjwc_f-1.1-r1.ebuild: + marked ~ppc wrt #303931 + + 16 Dec 2010; Justin Lecher libjwc_f-1.1-r1.ebuild: + Removal of fortran.eclass, #348851 + + 29 Jul 2010; Jeremy Olexa libjwc_f-1.1-r1.ebuild: + add ~x64-macos, bug 328151 + + 15 Jun 2010; Justin Lecher libjwc_f-1.1-r1.ebuild: + Fixed typo in DESCRIPTION + + 29 Mar 2010; Justin Lecher libjwc_f-1.1-r1.ebuild: + Keyworded for ~x86-linux ~amd64-linux + +*libjwc_f-1.1-r1 (02 Feb 2010) + + 02 Feb 2010; Justin Lecher (jlec) + +files/612-gentoo.patch, +libjwc_f-1.1-r1.ebuild, +metadata.xml: + Split library from ccp4 package + diff --git a/dev-libs/libjwc_f/files/612-gentoo.patch b/dev-libs/libjwc_f/files/612-gentoo.patch new file mode 100644 index 0000000..e687d8b --- /dev/null +++ b/dev-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/dev-libs/libjwc_f/files/libjwc_f-1.1-else.patch b/dev-libs/libjwc_f/files/libjwc_f-1.1-else.patch new file mode 100644 index 0000000..23e3dc1 --- /dev/null +++ b/dev-libs/libjwc_f/files/libjwc_f-1.1-else.patch @@ -0,0 +1,20 @@ +--- a/libjwc_f-1.1/libjwc_f/rpf_dstar.f ++++ b/libjwc_f-1.1/libjwc_f/rpf_dstar.f +@@ -376,8 +376,7 @@ + INR_FLAG = 2 + PHIW = 0.0 + END IF +- RETURN +- ENDIF ++ ELSE + C + C---- Calculate distance of edge of spot from sphere at end of rotation + Crotgen.for +@@ -419,6 +418,7 @@ + INR_FLAG = 4 + 40 RETURN + END IF ++ END IF + END IF + RETURN + END diff --git a/dev-libs/libjwc_f/libjwc_f-1.1-r3.ebuild b/dev-libs/libjwc_f/libjwc_f-1.1-r3.ebuild new file mode 100644 index 0000000..d3d33eb --- /dev/null +++ b/dev-libs/libjwc_f/libjwc_f-1.1-r3.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libjwc_f/libjwc_f-1.1-r2.ebuild,v 1.5 2012/10/19 10:32:13 jlec Exp $ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=yes + +inherit autotools-utils fortran-2 toolchain-funcs + +PATCH="612" + +DESCRIPTION="Additional fortran library for ccp4" +HOMEPAGE="http://www.ccp4.ac.uk/main.html" +SRC_URI="ftp://ftp.ccp4.ac.uk/jwc/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="static-libs" + +RDEPEND=" + dev-libs/libjwc_c + sci-libs/libccp4 +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PATCH}-gentoo.patch + "${FILESDIR}"/${P}-else.patch +) + +src_prepare() { + rm missing || die + echo "libjwc_f_la_LIBADD = -ljwc_c $($(tc-getPKG_CONFIG --libs libccp4f))" >> Makefile.am || die + autotools-utils_src_prepare +} + +src_install() { + HTML_DOCS=( doc/. ) + autotools-utils_src_install +} diff --git a/dev-libs/libjwc_f/metadata.xml b/dev-libs/libjwc_f/metadata.xml new file mode 100644 index 0000000..4bf6dbc --- /dev/null +++ b/dev-libs/libjwc_f/metadata.xml @@ -0,0 +1,8 @@ + + + + sci + + sci@gentoo.org + +