Fixed for gcc-4.8 (bug #500562), added library subslot deps

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 34 insertions, 15 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/Manifest b/sci-astronomy/casacore/Manifest
index 620a38332e95..68de791c959d 100644
--- a/sci-astronomy/casacore/Manifest
+++ b/sci-astronomy/casacore/Manifest
@@ -4,15 +4,16 @@ Hash: SHA256
 AUX 1.3.0-implicits.patch 6143 SHA256 88a66a6138a4f97fb23e5da4e7f14999e749d54bec1639e13f6d2ce575e1a932 SHA512 4dd3198c5d2993b91968992104c048efa82861b28b5cf0cb99af70db6f9323044421bccf6ec91dffbd816ab7fbea055cefeeae378f15def9bf60e5993d7e440c WHIRLPOOL 02ab1ad9bea27b9ef60922b3effc0fcc69dac2c0e825b03c9fd83c502d36945e99fc402845898a62cb148c852687c315f41bf0bc327831cef86900cba059403e
 AUX 1.3.0-libdir.patch 7892 SHA256 931a3bf15738b4d6381d2cdccbcf78f46ab48298a369d8ee7e79b09fd8b8cffb SHA512 8d521844a37a6739ba2f4e183641db6470ab325c19f953ade6f2fac5379bf4c571e922359e4db151df92d1282c0b17edd99cab6b4047da5668f50497120a59dd WHIRLPOOL a65aa957f99d86376ac8496fce810376e9f6af22376c16ad6e06c7642db5d305a78bd5de977c3307c70dfb268e504819436ebedc5d3fdf5e97e69fe08338b6f6
 AUX 1.5.0-gcc47.patch 862 SHA256 a314ce2cb93929e4e9e53e948ad404b48400fcef18ab96ecc698e6bb2c48a4e7 SHA512 f5d1e6d49b0e86e15b884dd3e4dedddbd55b17c40f4fbf2e2e18f194c3f66eb5c9e1b6288296b62423b045425da8705aa321b3915f6f19a2ca0d89a808437433 WHIRLPOOL 5de0adb970eeaab3fe5e466277b36688510c6f43c35234f4ae3bcf0b1abb9eb1c402cb5da40c7968b196c1c489abb12ba262985147a1337d44fef797ca5b3959
+AUX 1.5.0-gcc48.patch 375 SHA256 5162d481c7d62d8fce4f8c45eb327cae678880249c420e4e8f13c729c177794e SHA512 07149e3e31eaacefb2e5b34fd1ae90eb803569c06f35e3216c8d67e985d355d628bafa3a27d72f13a277d19ddd40b6eaecdd331400001b9a9abcbe8580006b2d WHIRLPOOL c8fe2256f1a992a750bbd7e00fc1e59c1f6f5fb0ec6ecd08209774abe97483e7cbb7681e177d899100ee349a2189832d7250391d8c0840f1c8d720e6156a974c
 AUX 1.5.0-sysdep.patch 526 SHA256 99899be7d3973ec5575a11f35bf15cbe318efb83b3467199f27532b1348805be SHA512 76f672860040b4c1faccbe4002405990b0c1d35f0fac54f0d54d8e19878df9056fd4e5d4a540da110e3a29fcd308e1a331be8accb3d89b49ee223abf5f21864c WHIRLPOOL 145666d60fd5935cedc74e35b8f3beecf6fe37a100ec33b4db857b9871f8aa4a53d57f8399ce2942a002b1c4d590471a33b5d53a008b15c7a5bf91d7ea9b221d
 DIST casacore-1.5.0.tar.bz2 6327906 SHA256 95ec894b5721ee2391c0d79fc45528c431edb2c6b335ad67fe0b6afabf0c70cb SHA512 a3e108f525775ec5022005ce73810a6bc8eb0a6abcbcaed96f2af3ba7911a3675872708ea53afbfb8a143312709a336aabca21cf1fea0396cc4adc56ba08f3f1 WHIRLPOOL c0aa888a9123ec5b7a5e0eedc8c5fe88241c6e7a9f9d138361e68b0f2da17a8a6275250a07eaa7ac55d2a7c17145478ca1668ae8ce11fb17def61e86afb534b8
-EBUILD casacore-1.5.0.ebuild 1779 SHA256 adf381c547f785e37f8ff7442f5345b09b94d4ab6ccb0d4b049144bc80497090 SHA512 1465c5171299f517e867f70ab98024fabeab1150cb7e6ed33e4dc19ff0f45192884d14a1ba5fd2a422641113c835c90eda47a88b1cb9afe6227e32649f746a31 WHIRLPOOL 5ed402408b4dbf1b3944d4cb22061416282dc78700145806581db8e6322ec15e68d5481a66b63393d07e5510cd53a89a36b8ef7f9030fb30ef981d494f5a159e
-MISC ChangeLog 1698 SHA256 fe9f798399254deb7072fd67e84b470c3115ea5e39222e4dd7161175416e7711 SHA512 3ab7314fe3acca61c8a4e7eac9d49f14e6508adbf4820d8f33be1a6bbfb210df2cb424f587aa45c52faecbe1f5e89ec20fc20ab041386315faa82da5eda90930 WHIRLPOOL faffbfcca65b44bcc2189355ff14788dcb6d1adaf9924c0f6e3ca6c96e13109981cbbd4eb97e8ba36f10bbaab56d225a15f0b2400421b72475cdbe21b47e945f
+EBUILD casacore-1.5.0-r1.ebuild 1828 SHA256 baa6d601eaf636d4ddf4e421295df7e2e9eef9e08e84399529c83f3082fbe3ff SHA512 a7c045e60d7999774e231aa4d337c312fbd08a4051dead03647703e1fe4b2fdc2de0e372b07e7bc98dffc6a2b5b061e86a7b5b9ae145fe9aa1c2e411eec53d2b WHIRLPOOL 1487024ae636434db04990b96931ed149574f0edd8a056040415be9b01c91b6a6996122c87818fdb6c8bea29dc17b93334c3bf8472aef0d235bc6824f081423d
+MISC ChangeLog 1929 SHA256 8938d03364169d2dec0e862cdbfeba0df942582aaf902a2ba114c6053bcd8849 SHA512 a0f664b09d0c21a5490035065d0203c1e9844fa160ff7135d65895df73cf41b3eb07d1661475341b1b106531c0f62220fdb311117327cf338852fa2608755d2f WHIRLPOOL 111c67d3eec6ccb27614c08b35df11678ecb858161692c1a0c4dc15cf37adf366852dac4a25173cee6349f126c1622e72cbbe887fb04bebc21e9fd44a79de3c9
 MISC metadata.xml 587 SHA256 d21856d684c73246162c6d1642eb56592231f96ac119917f6f13f61d83ea23e6 SHA512 4914a5c829d93f0c804e186618510b6e03a37b79d71113cea295f202ea5db534c8df535fbef793fb4dabc22bc8cc5ffd68af68822c5afbb434cdaadc75b94d79 WHIRLPOOL 537e0353883de6fd4671320180e1853630063afcb430ba39d8ba56f6c2428c4f3d4ec600210d4385ead64d57608f6eb0602ce2882e39f0e5c3feb2b82e896351
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIChx8ACgkQ1ycZbhPLE2Dn9ACcDGwvXLPLfacDR5PjceWAx6aZ
-NH4An0E9C2ZpXPNinLaRAJBivm8KP4lE
-=rqhA
+iEYEAREIAAYFAlMY9PgACgkQ1ycZbhPLE2B4ugCfZekzLRYa3AHl+s4OpznSs0UA
+ppoAn0lVfmuZoTEgIFvW1bo/6xlSqyU8
+=Q/Ts
 -----END PGP SIGNATURE-----
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)