[gentoo-commits] proj/sci:master commit in: sci-libs/lemon/files/, sci-libs/lemon/

["Justin Lecher" <jlec@gentoo.org>]

commit:     a7d47580b8a5cbab9d6f39124859d4445d1e11c1
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 16:35:56 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 16:36:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a7d47580

sci-libs/lemon: Fix for multilib-strict

Package-Manager: portage-2.2.8

---
 sci-libs/lemon/ChangeLog                      |  6 +++++-
 sci-libs/lemon/files/lemon-1.3-multilib.patch | 18 ++++++++++++++++++
 sci-libs/lemon/lemon-1.3.ebuild               |  5 ++++-
 sci-libs/lemon/metadata.xml                   | 22 +++++++++++-----------
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/sci-libs/lemon/ChangeLog b/sci-libs/lemon/ChangeLog
index 7499141..f565264 100644
--- a/sci-libs/lemon/ChangeLog
+++ b/sci-libs/lemon/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/lemon
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Jan 2014; Justin Lecher <jlec@gentoo.org> lemon-1.3.ebuild,
+  +files/lemon-1.3-multilib.patch, metadata.xml:
+  Fix for multilib-strict
+
 *lemon-1.3 (08 Dec 2013)
 
   08 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org> +lemon-1.3.ebuild,

diff --git a/sci-libs/lemon/files/lemon-1.3-multilib.patch b/sci-libs/lemon/files/lemon-1.3-multilib.patch
new file mode 100644
index 0000000..ee578d4
--- /dev/null
+++ b/sci-libs/lemon/files/lemon-1.3-multilib.patch
@@ -0,0 +1,18 @@
+ lemon/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
+index 8011833..0209acf 100644
+--- a/lemon/CMakeLists.txt
++++ b/lemon/CMakeLists.txt
+@@ -61,8 +61,8 @@ ENDIF()
+ 
+ INSTALL(
+   TARGETS lemon
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION lib${LIB_SUFFIX}
++  LIBRARY DESTINATION lib${LIB_SUFFIX}
+   COMPONENT library
+ )
+ 

diff --git a/sci-libs/lemon/lemon-1.3.ebuild b/sci-libs/lemon/lemon-1.3.ebuild
index f599106..de536b1 100644
--- a/sci-libs/lemon/lemon-1.3.ebuild
+++ b/sci-libs/lemon/lemon-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="|| ( coin glpk )"
 
+PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
+
 src_prepare() {
 	sed -i \
 		-e '/ADD_SUBDIRECTORY(demo)/d' \
@@ -56,6 +58,7 @@ src_prepare() {
 		-e '/ADD_TEST(lp_test lp_test)/d' \
 		-e '/ADD_DEPENDENCIES(check lp_test)/d' \
 		test/CMakeLists.txt || die
+	cmake-utils_src_prepare
 }
 
 src_configure() {

diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml
index 3cea904..fa9c548 100644
--- a/sci-libs/lemon/metadata.xml
+++ b/sci-libs/lemon/metadata.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>mmokrejs@fold.natur.cuni.cz</email>
-  <name>Martin Mokrejs</name>
-</maintainer>
-<longdescription>
+  <herd>sci</herd>
+  <maintainer>
+    <email>mmokrejs@fold.natur.cuni.cz</email>
+    <name>Martin Mokrejs</name>
+  </maintainer>
+  <longdescription>
   LEMON stands for Library for Efficient Modeling and Optimization in
   Networks. It is a C++ template library providing efficient
   implementations of common data structures and algorithms with focus
   on combinatorial optimization tasks connected mainly with graphs and
   networks.
 </longdescription>
-<use>
-  <flag name="coin">Enable the <pkg>coinor-clp</pkg> and
+  <use>
+    <flag name="coin">Enable the <pkg>coinor-clp</pkg> and
   <pkg>coinor-cbc</pkg> graph algorithms</flag>
-  <flag name='glpk'>Enable GNU Linear Programming Kit
+    <flag name="glpk">Enable GNU Linear Programming Kit
   <pkg>sci-mathematics/glpk</pkg> support</flag>
-  <flag name="tools">Build additional tools</flag>  
-</use>
+    <flag name="tools">Build additional tools</flag>
+  </use>
 </pkgmetadata>