From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A8227138247 for ; Sat, 18 Jan 2014 07:39:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D592AE0DC3; Sat, 18 Jan 2014 07:38:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F5FFE0DC1 for ; Sat, 18 Jan 2014 07:38:53 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E02033FA1A for ; Sat, 18 Jan 2014 07:38:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 70A7D18730 for ; Sat, 18 Jan 2014 07:38:50 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1390030713.34efa4e668a6b6c06512de7371e28c07ca8ab85e.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/lemon/files/, sci-libs/lemon/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/lemon/ChangeLog sci-libs/lemon/files/lemon-1.3-multilib.patch sci-libs/lemon/lemon-1.3.ebuild sci-libs/lemon/metadata.xml X-VCS-Directories: sci-libs/lemon/files/ sci-libs/lemon/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 34efa4e668a6b6c06512de7371e28c07ca8ab85e X-VCS-Branch: master Date: Sat, 18 Jan 2014 07:38:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ef781dd5-ee8b-4ebb-a017-813f96f74e90 X-Archives-Hash: df7eeed07032f81324371aff838b3226 commit: 34efa4e668a6b6c06512de7371e28c07ca8ab85e Author: Justin Lecher gentoo org> AuthorDate: Mon Jan 13 16:35:56 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Jan 18 07:38:33 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=34efa4e6 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 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 +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 @@ -sci - - mmokrejs@fold.natur.cuni.cz - Martin Mokrejs - - + sci + + mmokrejs@fold.natur.cuni.cz + Martin Mokrejs + + 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. - - Enable the coinor-clp and + + Enable the coinor-clp and coinor-cbc graph algorithms - Enable GNU Linear Programming Kit + Enable GNU Linear Programming Kit sci-mathematics/glpk support - Build additional tools - + Build additional tools +