Updating sci-libs/lalapps-6.11.2.ebuild

5 files changed, 39 insertions, 30 deletions

diff --git a/sci-libs/lalapps/Manifest b/sci-libs/lalapps/Manifest
index c13b3a2..8b4808b 100644
--- a/sci-libs/lalapps/Manifest
+++ b/sci-libs/lalapps/Manifest
@@ -3,8 +3,8 @@ DIST lalapps-6.6.1.tar.gz 5429364 SHA256 0d88ad1288cf723bad70d77b98c5d255b2d15d8
 DIST lalapps-6.6.2.tar.gz 5429430 SHA256 0abdee3fcb83e06cd56175203b1026b708d51f43e66b13782c35c7c438bca567 SHA512 f583cf5d8f2588730b1b16f49800540b69ab06e5bbbce3ede8b93121880204da9d6c6cd23e7eab19a8a360d27db8ff9d91d4958992d97eaccc47adcacfa04aef WHIRLPOOL 4c81d46c9020f6c7487858017c44716dc4f153f0c5a2303c38c8a8d732076e7f96264236b140331b0dc1114a6fe586aa5e681c6406288dcf3f7ff11c0aa2b187
 DIST lalapps_missing-6.6.1.tar.gz 1157 SHA256 81d2e8cf72f8785ea06074d7741e0e376c45ccaf8fc23f2d8bbe409ab8ccf052
 DIST lalapps_missing-6.6.2.tar.gz 1157 SHA256 b80823448f374c3428578d2b906889ac979869e4c532e0e6522794931b74e451 SHA512 7b4fe236829a96497d73aeaea973a795b78c34fbd674099bdac474ec5b0b0dcd4d8ea7e2a09ecf07e96fced8eb8d68d9aaeed25af4dde68ba54dc7ea8ddf4ceb WHIRLPOOL 756f766cd479b69aed1c48b5ee388ba5e7040f5d0e259139ba6db0a91cba34a1dc64de233d79fcc66bb39bfe6c0932e29d6311e1dff50cc9fabd39bf3bcaa9ce
-EBUILD lalapps-6.11.2.ebuild 1477 SHA256 86eac004b63707ed028e33ccaacf7dbb391d2fbb67afda62ed7c39806897fdef SHA512 e6458faa989fbd219d31a226babb8314384a9835357e37dc50e303697b547a37fcd2b66acb26551e6487bdb904c05115c6883b392e694cb49d409016bb330ef5 WHIRLPOOL 62fd2ae2ac6cf3314b91114384455cd4f179afbf58f2bdb9fb7f4d1f8a88876f9bde57104dd41662b74e68d0defe5053d6f7e80b983f4e446f44428f3bffec76
+EBUILD lalapps-6.11.2.ebuild 1280 SHA256 e31b76c51c56d5b3043dd08ee1582217c4fc86d0540cb15bb4285e946400ef00 SHA512 d153e7d0f11b06c679a789fc10f6615c8cec07d65ebe223a6fe4900f8418e66372937499c3019f50dc6dade286a5a25aa45fb475fc1b6677a5f3ca8f6c409ce9 WHIRLPOOL fd014738fa2f42300ec0e8e496c6c0f185991db833014388361c4af3fa7271a1897a0fbdb51f1d96e1aeed771531df165ddd9eae252972262e8708e2b0d4d0b7
 EBUILD lalapps-6.6.1.ebuild 1540 SHA256 81a9d1ce74d8ad85749f6f5f4a7c58b08d947753be05b07641a5c9c0aabd1900 SHA512 d5218a21d2e970e1f83c33d6c185be94404c1d24483f1a9b6987f77515985154611817af142e54bf6a26c4c0ee9fbafc7dbf578b579be91c3e87b7ca55efa9d6 WHIRLPOOL d9f85b34b35f11fe0162e7e53e79bd71209bb52f707aecf0caf8388600b20d2ad0ac4ed306a35525ce6a73cf1b63ad9d0022736db71e9deb0a68093c6b7cf2f2
 EBUILD lalapps-6.6.2.ebuild 1540 SHA256 81a9d1ce74d8ad85749f6f5f4a7c58b08d947753be05b07641a5c9c0aabd1900 SHA512 d5218a21d2e970e1f83c33d6c185be94404c1d24483f1a9b6987f77515985154611817af142e54bf6a26c4c0ee9fbafc7dbf578b579be91c3e87b7ca55efa9d6 WHIRLPOOL d9f85b34b35f11fe0162e7e53e79bd71209bb52f707aecf0caf8388600b20d2ad0ac4ed306a35525ce6a73cf1b63ad9d0022736db71e9deb0a68093c6b7cf2f2
 MISC ChangeLog 519 SHA256 ba090b8fac0cfc118d40de41c06a1d5e49b163dcc4ce1b69b02c0831a913ec50 SHA512 6c8878c950eeb32a577f9e2dc8993fbcfd0a7b3c9e6da69db89917ad4e98c674dd490b803115b0501daf215c1f05e605d63b3f6c6c63950bf5f59af97f506c54 WHIRLPOOL 0cc2f0907036667b8ea685f27c040b6cd3cec6805e7b6e3fb37b8b4f4ee014e5c6fcf7ec0d5a9cffd36b9cd04be713bbc685679224b81b4fb191d39f383c4fae
-MISC metadata.xml 250 SHA256 e44c070cff68ec9a61d9a6304001c836fc4522a567a1759f959ef69e6abbe1c4 SHA512 716cf7255da4aeae4a8c3292e536297828f7e0cb37a65de5793f9cc2b4960dd6db46f089e3df6ab1d088005cff00ad77e3769ce928a21d35ea629de341c5a5dd WHIRLPOOL f035c67b4226ed088b3e84d194910cea9373834fc901083bb6010b13620f5d6ce09c1309014b577f2c383b0f60459b9188caf6b253990f4521d76baa77ff2cb5
+MISC metadata.xml 428 SHA256 bf5abddec3010a71607ca69ea9f79b1755d1617e18ef45096386e65bd6ae962b SHA512 719ecde2c04c393386ce76e599b7410d081be26e6c4d3cb2485296bfa4bd49d6a6127286982583c959ef66cac41e81ab119acc64030deb50fef01defea275ad3 WHIRLPOOL b7707776d15c134649b0166502d99098a6322b61d44bddabe6b6b513cd2368649538cd830019fad3e171debf2607fda48430a921a97e6b0c831f292de8c93d61
diff --git a/sci-libs/lalapps/lalapps-6.11.2.ebuild b/sci-libs/lalapps/lalapps-6.11.2.ebuild
index 70e0e25..4c29bd0 100644
--- a/sci-libs/lalapps/lalapps-6.11.2.ebuild
+++ b/sci-libs/lalapps/lalapps-6.11.2.ebuild
@@ -4,45 +4,45 @@
 
 EAPI=4
 
-DESCRIPTION="LALapps contains applications for gravitational-wave data analysis written in ANSI C99."
+DESCRIPTION="Applications for gravitational-wave data analysis with LIGO/Virgo"
 HOMEPAGE="https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html"
 SRC_URI="https://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-#IUSE="mpi metaio lalframe lalmetaio lalxml"   # Repoman complains about these -> make dependencies non-optional...
-IUSE="doc mpi"
+IUSE="doc +mpi +metaio +frame xml"
 
-DEPEND="=sci-libs/lal-6.6.1
-		sci-libs/libframe
-		sci-libs/metaio
-		=sci-libs/lalframe-1.0.4
-		=sci-libs/lalmetaio-1.0.3
-		=sci-libs/lalxml-1.1.2
+DEPEND="sci-libs/lal
+		frame? ( sci-libs/libframe
+				 sci-libs/lalframe )
+		metaio? ( sci-libs/metaio
+				  sci-libs/lalmetaio )
+		xml? ( sci-libs/lalxml )
 		mpi? ( virtual/mpi )
 	   "
 RDEPEND=${DEPEND}
 
 src_configure() {
 	econf \
-		$(use_enable mpi) \
-		--enable-frame --enable-lalframe --enable-metaio --enable-lalmetaio --enable-lalxml
-	# Can't use use_enable for the rest, since these aren't valid USE flags
+		$(use_enable frame) \
+		$(use_enable frame lalframe) \
+		$(use_enable metaio) \
+		$(use_enable metaio lalmetaio) \
+		$(use_enable xml lalxml) \
+		$(use_enable mpi)
 }
 
 src_compile() {
-	emake || die "emake failed"
-	use doc && (
-		emake dvi || die "emake dvi failed" )
+	emake
+	use doc  &&  emake dvi
 }
 
 pkg_postinst() {
-	elog "\n\n    Now you may want to setup your environment:"
-	elog "\n    Bourne shell [bash] users: please add the"
-	elog "    following lines to your .profile file:"
+	elog "\n    Now you may want to setup your environment:"
+	elog "\n    Bourne shell [bash] users: please add the following line to your .profile file:"
 	elog "\n        . /etc/lalapps-user-env.sh"
-	elog "\n    C-shell [tcsh] users: please add the following"
-	elog "    lines to your .login file:"
-	elog "\n        source /etc/lalapps-user-env.csh\n\n"
+	elog "\n    C-shell [tcsh] users: please add the following line to your .login file:"
+	elog "\n        source /etc/lalapps-user-env.csh"
+	elog ""
 }
diff --git a/sci-libs/lalapps/metadata.xml b/sci-libs/lalapps/metadata.xml
index e8ef06d..2f20553 100644
--- a/sci-libs/lalapps/metadata.xml
+++ b/sci-libs/lalapps/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>AstroFloyd@gmail.com</email>
-		<name>AstroFloyd</name>
-	</maintainer>
+  <herd>sci</herd>
+  <maintainer>
+    <email>AstroFloyd@gmail.com</email>
+    <name>AstroFloyd</name>
+  </maintainer>
+  <use>
+    <flag name='metaio'>Adds support for <pkg>sci-libs/lalmetaio</pkg></flag>
+    <flag name='frame'>Adds support for <pkg>sci-libs/lalframe</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/lalstochastic/Manifest b/sci-libs/lalstochastic/Manifest
index 33ba8d5..71865b9 100644
--- a/sci-libs/lalstochastic/Manifest
+++ b/sci-libs/lalstochastic/Manifest
@@ -1,6 +1,6 @@
 DIST lalstochastic-1.1.3.tar.gz 1073211 SHA256 fa73ff72d0c1408764c1833a90ae20911debbef7847f7b0c74935b55ebfd8d90 SHA512 96c74ca12d3bf302f4749460fdd72c2a563a5d55d1f38b5a5c7de2b28d029a885a76698510a132265da8b08fbc94a81c32efbd33fa66d3566ca6623100646004 WHIRLPOOL 77d7b111fab599f2da7f58650fa4127ec9feed9bb18a2cdc6bd30fbd361115279fa99056eff76d6a493b931f00012bd8a4045a0d5f569b6146b8958e7017f634
 DIST lalstochastic-1.1.7.tar.gz 1033307 SHA256 43e4d61bfd026d861e33be5a352e6ad2c2498328394c3cfd35482be2d7c4cc4e SHA512 e39c2ec427a9727bda93c64ba47d1208d10245ac7ae10eefaad31e6db7145f25e6a6360148d1b042db8cec7ca341643bea1a7062060fd2a2882558306c7c1807 WHIRLPOOL 291a7d1e5474872a6c640bc39ba022d1c2e7b42d9dc49e9c3aeaceeba66dbc274c953ee76a15a5a0470ffec9349cf464b37d8dfa01371f06b52d8719892be037
 EBUILD lalstochastic-1.1.3.ebuild 509 SHA256 1266d8899f8d0317f054ae0cd725a7b307c2cc948812d0335796677da8e2add9 SHA512 136f1ce3e8f2de5ce89020145c380818c9329a19e7532feca3e667c95de29595e59ea45b2666b46dbd085a37606f5be5175b18c0c3ebc3882cb492f90f618d32 WHIRLPOOL 69a9cecd435e01ef0679b363dd05941ac2303c983e0f2628cebe15bc11c79671c6eb2646bd72490fd93610c8aa895572e493f519f36cefe2b62f87dd93bbf1d3
-EBUILD lalstochastic-1.1.7.ebuild 870 SHA256 7c430ab8199035033025af1d22896172ae64740e6b5c7e5cd49f189ed4223795 SHA512 a10e3557bec486cd5106dcef502bbd37bf0c57a0e8d59e85e66af947de28fc50d3761e05a59b5d9a6690661be80a01de58fa3e6b8816c1c21c46800d6885fc55 WHIRLPOOL e7aa4aaf5d61040c987eca573bf4a04b335d1f322dfd43ec4c5079987958cb810fd0965b176dfe5082395148bccb4c79a96d60bb412d20739e32b4ac8f89e457
+EBUILD lalstochastic-1.1.7.ebuild 938 SHA256 fda3269c2efa555763e38e4e1533ca43651da4b778c8df5ea3a51deb8be2dacf SHA512 81222902f2a838cc371a1e7192a0c95000eadedf95fd38014625e56d3991211d7c07d390ccdfeb7f49af67dbfadfda9120b8f2af3abd3066c6aff27a0a112a98 WHIRLPOOL feb1f05ecbd1a8eda22ef9ad7f553675287b00a183009cb668de8ecc01c9c5289a00006bf4dea3bac020c5fc1b115169e9e3b816c5ae0533a6a3a3f967ee42ed
 MISC ChangeLog 305 SHA256 eafd963180bd0c7f2d27e5da8dc21ced00b745b725dfb22fca5041a25420a46c SHA512 5d84af31a12f93e69e6f689f352d3c4de7c31e0c0b35fdc7eec64ca18f1f2ec380726fb362d20df9654d67c43f065a590e39140995a699c7675acd98b9644c27 WHIRLPOOL 43218ce92e1731c328a96abf2fb5c879964af57b2aabb6ad4f4638eb33998c5f8b18d34124a605b6e91db165e0127607a348668c151eb4a2fb71b79536abfc8b
 MISC metadata.xml 250 SHA256 e44c070cff68ec9a61d9a6304001c836fc4522a567a1759f959ef69e6abbe1c4 SHA512 716cf7255da4aeae4a8c3292e536297828f7e0cb37a65de5793f9cc2b4960dd6db46f089e3df6ab1d088005cff00ad77e3769ce928a21d35ea629de341c5a5dd WHIRLPOOL f035c67b4226ed088b3e84d194910cea9373834fc901083bb6010b13620f5d6ce09c1309014b577f2c383b0f60459b9188caf6b253990f4521d76baa77ff2cb5
diff --git a/sci-libs/lalstochastic/lalstochastic-1.1.7.ebuild b/sci-libs/lalstochastic/lalstochastic-1.1.7.ebuild
index c50b3f6..0c7dae7 100644
--- a/sci-libs/lalstochastic/lalstochastic-1.1.7.ebuild
+++ b/sci-libs/lalstochastic/lalstochastic-1.1.7.ebuild
@@ -13,8 +13,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="sci-libs/lal
+DEPEND="
+		sci-libs/metaio
 		sci-libs/lalmetaio
+		sci-libs/lal
+		sci-libs/fftw
+		sci-libs/gsl
+		sys-libs/zlib
 	"
 RDEPEND=${DEPEND}