diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2014-03-06 22:21:40 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2014-03-06 22:21:40 +0000 |
| commit | 001ba21613ec567799bcd3a333dcbaa9f0daf510 (patch) | |
| tree | 7e3b92fb46498bdbe9f61f5a0b67c8006d45899d /sci-astronomy | |
| parent | Initial import of libepoxy, versions 1.1 and 9999. (diff) | |
| download | gentoo-2-001ba21613ec567799bcd3a333dcbaa9f0daf510.tar.gz gentoo-2-001ba21613ec567799bcd3a333dcbaa9f0daf510.tar.bz2 gentoo-2-001ba21613ec567799bcd3a333dcbaa9f0daf510.zip | |
Fixed for gcc-4.8 (bug #500562), added library subslot deps
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-astronomy')
| -rw-r--r-- | sci-astronomy/casacore/ChangeLog | 10 | ||||
| -rw-r--r-- | sci-astronomy/casacore/casacore-1.5.0-r1.ebuild (renamed from sci-astronomy/casacore/casacore-1.5.0.ebuild) | 15 | ||||
| -rw-r--r-- | sci-astronomy/casacore/files/1.5.0-gcc48.patch | 11 |
3 files changed, 27 insertions, 9 deletions
diff --git a/sci-astronomy/casacore/ChangeLog b/sci-astronomy/casacore/ChangeLog index 7509259456b4..13433eb91a5d 100644 --- a/sci-astronomy/casacore/ChangeLog +++ b/sci-astronomy/casacore/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-astronomy/casacore -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/casacore/ChangeLog,v 1.7 2013/08/07 17:42:53 bicatali Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/casacore/ChangeLog,v 1.8 2014/03/06 22:21:39 bicatali Exp $ + +*casacore-1.5.0-r1 (06 Mar 2014) + + 06 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> +casacore-1.5.0-r1.ebuild, + +files/1.5.0-gcc48.patch, -casacore-1.5.0.ebuild: + Fixed for gcc-4.8 (bug #500562), added library subslot deps 07 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org> casacore-1.5.0.ebuild, metadata.xml: diff --git a/sci-astronomy/casacore/casacore-1.5.0.ebuild b/sci-astronomy/casacore/casacore-1.5.0-r1.ebuild index 4f29abd25b6a..850c8fbba346 100644 --- a/sci-astronomy/casacore/casacore-1.5.0.ebuild +++ b/sci-astronomy/casacore/casacore-1.5.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/casacore/casacore-1.5.0.ebuild,v 1.4 2013/08/07 17:42:53 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/casacore/casacore-1.5.0-r1.ebuild,v 1.1 2014/03/06 22:21:39 bicatali Exp $ EAPI=5 @@ -16,14 +16,14 @@ SLOT="0" IUSE="+data doc fftw hdf5 openmp threads test" RDEPEND=" - sci-libs/cfitsio - sci-astronomy/wcslib - sys-libs/readline + sci-libs/cfitsio:0= + sci-astronomy/wcslib:0= + sys-libs/readline:0= virtual/blas virtual/lapack data? ( sci-astronomy/casa-data ) - fftw? ( >=sci-libs/fftw-3 ) - hdf5? ( sci-libs/hdf5 )" + fftw? ( sci-libs/fftw:3.0= ) + hdf5? ( sci-libs/hdf5:0= )" DEPEND="${RDEPEND} virtual/pkgconfig doc? ( app-doc/doxygen ) @@ -34,6 +34,7 @@ PATCHES=( "${FILESDIR}"/1.3.0-libdir.patch "${FILESDIR}"/1.5.0-sysdep.patch "${FILESDIR}"/1.5.0-gcc47.patch + "${FILESDIR}"/1.5.0-gcc48.patch ) pkg_setup() { diff --git a/sci-astronomy/casacore/files/1.5.0-gcc48.patch b/sci-astronomy/casacore/files/1.5.0-gcc48.patch new file mode 100644 index 000000000000..dfbe074e8735 --- /dev/null +++ b/sci-astronomy/casacore/files/1.5.0-gcc48.patch @@ -0,0 +1,11 @@ +--- casa/aipsdef.h.orig 2014-03-06 22:05:25.000000000 +0000 ++++ casa/aipsdef.h 2014-03-06 22:06:09.000000000 +0000 +@@ -91,7 +91,7 @@ + #else + #define WHATEVER_SUN_TYPEDEF(X) + #define WHATEVER_TYPENAME typename +-#if defined(AIPS_CRAY_PGI) ++#if defined(AIPS_CRAY_PGI) || defined(AIPS_GCC4) + #define WHATEVER_SUN_EXCEPTSPEC(X) throw(X) + #else + #define WHATEVER_SUN_EXCEPTSPEC(X) |