From bf45600067addb6d2b96597d82ce09a957811d61 Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Tue, 24 Jul 2012 13:50:21 +0000
Subject: sci-libs/shogun: Fix broken sed, #427884; add missing die

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
---
 sci-libs/shogun/ChangeLog           |  6 +++++-
 sci-libs/shogun/metadata.xml        | 24 ++++++++++++------------
 sci-libs/shogun/shogun-1.1.0.ebuild |  8 ++++----
 3 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'sci-libs/shogun')

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/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() {
-- 
cgit v1.2.3-65-gdbad