sci-libs/shogun: Fix broken sed, #427884; add missing die

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 34 insertions, 29 deletions

diff --git a/sci-libs/shogun/ChangeLog b/sci-libs/shogun/ChangeLog
index 986d7e950194..a64a2f382805 100644
--- a/sci-libs/shogun/ChangeLog
+++ b/sci-libs/shogun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/shogun
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/ChangeLog,v 1.2 2012/06/25 19:41:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/ChangeLog,v 1.3 2012/07/24 13:50:21 jlec Exp $
+
+  24 Jul 2012; Justin Lecher <jlec@gentoo.org> shogun-1.1.0.ebuild,
+  metadata.xml:
+  Fix broken sed, #427884; add missing die
 
   25 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> shogun-1.1.0.ebuild:
   newins is not recursive, bug #421293, thanks Eric Garioud
diff --git a/sci-libs/shogun/Manifest b/sci-libs/shogun/Manifest
index d6440ddcc37a..3abc58c3294c 100644
--- a/sci-libs/shogun/Manifest
+++ b/sci-libs/shogun/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX shogun-1.1.0-respect-ldflags.patch 332 RMD160 7da4e7c1d3c1967b80128a85dc4b825657bf0d09 SHA1 2b39db7545c9fc0be983105ad6f197c0724723fe SHA256 596e37d9bac7904808cf5cd58221f97f3ce3e583aed58697b4a4f995c9dd0eff
-AUX shogun-1.1.0-test-readline.patch 352 RMD160 adb00cafbbecdb81240e123a69f15126660975df SHA1 1b1539cd28fd0459b00926a301d18575ca1c9b84 SHA256 a8e0ecc78bf702bdfb8193fc94abd7745e8bfcee0fe1e6b4ba5efeac4c6df0cc
-AUX shogun-1.1.0-test-snappy.patch 506 RMD160 e000b8fdd67c991bde80d8fd29d52e8bcf71e40b SHA1 8af5880abeda1ce4ad73c67d3bc32e8ff6bcf91e SHA256 ef0489b05cd1dd494c4a9b5070277dbd7733b920cfcf045e87d6abcbd871f01f
-DIST shogun-1.1.0.tar.bz2 3485714 RMD160 8744c0463550d3b9b3d023ee5f236f696ca0ede2 SHA1 7847e7b365a06a01d9cd40732ca906ae464f975f SHA256 9f69638f0bc18995358c38cd6eed6437e6b90c1fceab7c6e64c9739b7e6cc40b
-DIST shogun-data-0.3.tar.bz2 126676026 RMD160 2169ddc8f744529a576fcbfc2dd498cf6436cc1a SHA1 feb21b8f3f5cfbeb5c2d7910bc5481e6b0277c44 SHA256 34272e3f5e6b6989a4941b925ab3a9cd1525d73180681884e948a673aff4ef89
-EBUILD shogun-1.1.0.ebuild 4395 RMD160 fe5641f3547283b96038251f0b784f3d0aaca57f SHA1 22d352f9aaea7b6c864277905d208d0815fc7aa9 SHA256 6a175265eaaa387429078b06daf89e106730803d3a432cc939b3c98289f8ec44
-MISC ChangeLog 609 RMD160 787bd860b265c945bba77b361ef063bfbe06aceb SHA1 fc158de367713332cdb99ebd4cbce175ddc78219 SHA256 1057d1d76d0ea674e92cf201e5aff2851d6e40e5bc7aaa0792a3afa522b0a23e
-MISC metadata.xml 1928 RMD160 1dbce3b25762793bde5017197bf0df5e090fff05 SHA1 669d72eeccfce0aa397771c3c26a4ea5084c7dff SHA256 3698c29b00d6933893b30da4ff6a0c66444cfbc7bcfcacdb5fae5dea97ac5277
+AUX shogun-1.1.0-respect-ldflags.patch 332 SHA256 596e37d9bac7904808cf5cd58221f97f3ce3e583aed58697b4a4f995c9dd0eff SHA512 496a5dfd0da302fd333651e6e363bd01ecc6dcc6ec06f2589f8dc3d42999936817f41144f9814717d311e47611a31b2cb57bee7d46df30ea20c8afe909f5f376 WHIRLPOOL c7d3701e573be10157432352263df70905c4f720d7767361487742bcb925c25cb39d4252f165db4368d0599079756907192b28f7237be1f13a3564cc910ac7cf
+AUX shogun-1.1.0-test-readline.patch 352 SHA256 a8e0ecc78bf702bdfb8193fc94abd7745e8bfcee0fe1e6b4ba5efeac4c6df0cc SHA512 6963b8e66361b02b894d48e5b8b2dbc15b4569947ba5be7db56c4aeff142f2c949583cfbbc713cc5900815072e80999dd804f8a342011247b34c7ac30db0fd86 WHIRLPOOL f22f31a231a56f4d805539388ae96e4742f7bf99a0a49887daefad14bb1d13454e800050528df48b5bed0e5db51dd9d867812e148ec4e5533fd8b19758541bdf
+AUX shogun-1.1.0-test-snappy.patch 506 SHA256 ef0489b05cd1dd494c4a9b5070277dbd7733b920cfcf045e87d6abcbd871f01f SHA512 04b4f29ec7d23377fb31474c9ef9c7d243b8ed9ef8e81c6340462763a4dc6ac6361c4e067d680089192ccd5bf5d50ffc2fca6087d74e17341c9b4ae858851096 WHIRLPOOL 302365d7ecd2ed235536a886a3ff1d2834bf51885e4acd4dd0d2a581e8776c7cdcee8632a8470c6b2df969df7fe0cba1d5574c7c870323a866825a0235eb0b76
+DIST shogun-1.1.0.tar.bz2 3485714 SHA256 9f69638f0bc18995358c38cd6eed6437e6b90c1fceab7c6e64c9739b7e6cc40b SHA512 853168e3d68ad02ef543391b78c51682d004af46acddfa09a76b41e373e27199fc9be0598892207e116a82f24437e3f1c0dc97c3e28ca32879594fbe112bd157 WHIRLPOOL dd044ff2cc9fd9376b80f1efd9bbcf901b11765a2f85eb2325ddd640ea547e513df8c9da548634e49758ef124147666f86b6b4082e118c6d35ef2d5010527cf9
+DIST shogun-data-0.3.tar.bz2 126676026 SHA256 34272e3f5e6b6989a4941b925ab3a9cd1525d73180681884e948a673aff4ef89
+EBUILD shogun-1.1.0.ebuild 4405 SHA256 37d1057c9e2d89f808e019b51debcbb7cdd394a3ccef7e66b54c56cca9299b9f SHA512 9d995554d95e09bcff65dcdb26d9f74729c7f3e6f1ea7e1bca869e66a651abc4c5c7c0ebfe3c2d45b9ff15385afa680877a3c0a29c8b59f5debe92eea9b14808 WHIRLPOOL 74159247b6bb9a9e396081bbc6498ca1431260dcd75a3fc5ef911a14f46287e6043bd0578a998cdc60fe76cce875eef57d6a7bc87cd1adb51af1828c489b5810
+MISC ChangeLog 733 SHA256 380620b1f58874f6e367df82a3aa6e9cf4dec055e153517f15854f8a3464a0a8 SHA512 23da86f101ea796d5ad44b90234f506047ca43f94340c3f7aa5608ea58c22e7b8df829f0d52bc0afddb10263a7677562cd8e341e10e6f31eedc8ef71820d2ac9 WHIRLPOOL 0de057b4777249da09a56ed133b52638b0fd06a37babfa8e7425d6ee30b1057febbad40afa2a12a6203365e73572fa295c433ff4e739ab656732d33341f100cf
+MISC metadata.xml 1932 SHA256 5a222b0b62edcd5ca620cd4df8c2349ff8924bfb1f649a431ee76b33e48f2767 SHA512 347aa7c3f9fc374853c8159c1d58d627000b144e8d9ce30fdcfc9d30d3420bd2fcd1b40271e2bc6d5f72be3874cf6fbe141c22217219e8f1ea755d218feaf4ea WHIRLPOOL 802af86128b6ab125b5e5c02022d03d64525d1ccd3c114f5a9896aa28ceaf5e2bc1cc1566c0318e10b19d5702b5502341711bf8767d995ed48b40cbd380c4645
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk/ovuYACgkQ1ycZbhPLE2Bn+wCfVxFlSMuhyvsfaXR8BFwjJ55C
-FcEAn3qVfMhbM9NP+R6TXnII73ipiirw
-=BdaB
+iEYEAREIAAYFAlAOqCMACgkQgAnW8HDreRYoswCfexTAzHfQD/9Kg+SebTqRUGOd
+PrUAnjMvOvURKa1H2Tx/exz6WM3B9N1q
+=bGXa
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/shogun/metadata.xml b/sci-libs/shogun/metadata.xml
index 72a2a3c06a1a..36c41b823e70 100644
--- a/sci-libs/shogun/metadata.xml
+++ b/sci-libs/shogun/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
    SHOGUN - is a new machine learning toolbox with focus on large
    scale kernel methods and especially on Support Vector Machines
    (SVM) with focus to bioinformatics. It provides a generic SVM
@@ -21,14 +21,14 @@
    (e.g. substracting the mean) can be attached to each feature object
    allowing for on-the-fly pre-processing.
 </longdescription>
-<use>
-  <flag name="arpack">Enable support for <pkg>sci-libs/arpack</pkg></flag>
-  <flag name="glpk">Enable support for <pkg>sci-mathematics/glpk</pkg></flag>
-  <flag name="json">Enable support for parsing JSON format</flag>
-  <flag name="lpsolve">Enable support for Linear Programming Solver</flag>
-  <flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
-  <flag name="octave">Enable support for <pkg>sci-mathematics/octave</pkg></flag>
-  <flag name="snappy">Enable support for snappy compression</flag>
-  <flag name="superlu">Enable support for <pkg>sci-libs/superlu</pkg></flag>
-</use>
+	<use>
+		<flag name="arpack">Enable support for <pkg>sci-libs/arpack</pkg></flag>
+		<flag name="glpk">Enable support for <pkg>sci-mathematics/glpk</pkg></flag>
+		<flag name="json">Enable support for parsing JSON format</flag>
+		<flag name="lpsolve">Enable support for Linear Programming Solver</flag>
+		<flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
+		<flag name="octave">Enable support for <pkg>sci-mathematics/octave</pkg></flag>
+		<flag name="snappy">Enable support for snappy compression</flag>
+		<flag name="superlu">Enable support for <pkg>sci-libs/superlu</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-libs/shogun/shogun-1.1.0.ebuild b/sci-libs/shogun/shogun-1.1.0.ebuild
index 995b048a9a12..1fc70df921e2 100644
--- a/sci-libs/shogun/shogun-1.1.0.ebuild
+++ b/sci-libs/shogun/shogun-1.1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/shogun-1.1.0.ebuild,v 1.2 2012/06/25 19:41:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/shogun-1.1.0.ebuild,v 1.3 2012/07/24 13:50:21 jlec Exp $
 
 EAPI=4
 
-inherit multilib versionator toolchain-funcs java-pkg-opt-2
+inherit eutils multilib versionator toolchain-funcs java-pkg-opt-2
 
 MYPV=$(get_version_component_range 1-2)
 MYPD=${PN}-data-0.3
@@ -66,7 +66,7 @@ src_prepare() {
 	sed -i \
 		-e 's/dist-packages/site-packages/g' \
 		-e '/^COMP_OPTS=/d' \
-		-e "s/-llapack -lcblas/$(pkg-config --libs cblas lapack)/g" \
+		-e "s:-llapack -lcblas:$(pkg-config --libs cblas lapack):g" \
 		configure || die
 
 	# disable ldconfig which violates sandbox
@@ -123,7 +123,7 @@ src_configure() {
 		$(use_enable snappy) \
 		$(use_enable static-libs static) \
 		$(use_enable superlu) \
-		$(use_enable xml)
+		$(use_enable xml) || die
 }
 
 src_compile() {