diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2014-01-15 19:35:03 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2014-01-15 19:35:03 +0000 |
| commit | 87d648ab0030f100a8e32dd41f138a4db70a6b6f (patch) | |
| tree | 60cc46e1e00bafdb48346dc2641e6dd72a919229 /sci-libs | |
| parent | Drop netbsd and openbsd prefix keywords, as they are not used in the tree. (diff) | |
| download | gentoo-2-87d648ab0030f100a8e32dd41f138a4db70a6b6f.tar.gz gentoo-2-87d648ab0030f100a8e32dd41f138a4db70a6b6f.tar.bz2 gentoo-2-87d648ab0030f100a8e32dd41f138a4db70a6b6f.zip | |
Cleanup, as-needed applied upstream
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/coinor-cbc/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-libs/coinor-cbc/coinor-cbc-2.8.8.ebuild | 27 |
2 files changed, 8 insertions, 24 deletions
diff --git a/sci-libs/coinor-cbc/ChangeLog b/sci-libs/coinor-cbc/ChangeLog index 7d162a082d58..bee38001f4ec 100644 --- a/sci-libs/coinor-cbc/ChangeLog +++ b/sci-libs/coinor-cbc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-libs/coinor-cbc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-cbc/ChangeLog,v 1.1 2014/01/14 18:58:08 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-cbc/ChangeLog,v 1.2 2014/01/15 19:35:03 bicatali Exp $ + + 15 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> coinor-cbc-2.8.8.ebuild: + Cleanup, as-needed applied upstream *coinor-cbc-2.8.8 (14 Jan 2014) diff --git a/sci-libs/coinor-cbc/coinor-cbc-2.8.8.ebuild b/sci-libs/coinor-cbc/coinor-cbc-2.8.8.ebuild index 2eb035ace1eb..c92069c760eb 100644 --- a/sci-libs/coinor-cbc/coinor-cbc-2.8.8.ebuild +++ b/sci-libs/coinor-cbc/coinor-cbc-2.8.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-cbc/coinor-cbc-2.8.8.ebuild,v 1.1 2014/01/14 18:58:08 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-cbc/coinor-cbc-2.8.8.ebuild,v 1.2 2014/01/15 19:35:03 bicatali Exp $ EAPI=5 @@ -31,29 +31,12 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MYPN}-${PV}/${MYPN}" -src_prepare() { - # as-needed fix - # hack to avoid eautoreconf (coinor has its own weird autotools) - sed -i \ - -e 's:\(libOsiCbc_la_LIBADD.*=\).*:\1 $(top_builddir)/src/libCbc.la $(top_builddir)/src/libCbcSolver.la:g' \ - src/OsiCbc/Makefile.in || die - sed -i \ - -e 's:\(libCbc_la_LIBADD.*=.*\)$:\1 @CBCLIB_LIBS@:' \ - -e 's:\(libCbcSolver_la_LIBADD.*=.*\)$:\1 libCbc.la:' \ - -e 's:\(libCbcSolver_la_DEPENDENCIES.*=\).*:\1 libCbc.la:' \ - src/Makefile.in || die - # bug for later versions of subversions - sed -i \ - -e 's/xexported/xexported -a "x$svn_rev_tmp" != "xUnversioned directory"/' \ - configure -} - src_configure() { local myeconfargs=( + --enable-dependency-linking $(use_with doc dot) ) - PKG_CONFIG_PATH+="${ED}"/usr/$(get_libdir)/pkgconfig \ - autotools-utils_src_configure + autotools-utils_src_configure } src_compile() { @@ -64,9 +47,7 @@ src_compile() { } src_test() { - pushd "${BUILD_DIR}" > /dev/null || die - emake test - popd > /dev/null || die + autotools-utils_src_test test } src_install() { |