diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2014-01-15 20:09:00 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2014-01-15 20:09:00 +0000 |
| commit | f079376247d503adfcb707bb8ba88df7f27ad66b (patch) | |
| tree | 4c7dc8b31d168e17123c20b85e87bb05376893a8 /sci-libs | |
| parent | version bump (diff) | |
| download | gentoo-2-f079376247d503adfcb707bb8ba88df7f27ad66b.tar.gz gentoo-2-f079376247d503adfcb707bb8ba88df7f27ad66b.tar.bz2 gentoo-2-f079376247d503adfcb707bb8ba88df7f27ad66b.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-osi/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/coinor-osi/coinor-osi-0.106.5.ebuild | 21 |
2 files changed, 9 insertions, 18 deletions
diff --git a/sci-libs/coinor-osi/ChangeLog b/sci-libs/coinor-osi/ChangeLog index 8886bf695c32..982593186978 100644 --- a/sci-libs/coinor-osi/ChangeLog +++ b/sci-libs/coinor-osi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/coinor-osi # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-osi/ChangeLog,v 1.1 2014/01/14 17:58:51 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-osi/ChangeLog,v 1.2 2014/01/15 20:09:00 bicatali Exp $ + + 14 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> + coinor-osi-0.106.5.ebuild: + Cleanup, as-needed applied upstream *coinor-osi-0.106.5 (14 Jan 2014) diff --git a/sci-libs/coinor-osi/coinor-osi-0.106.5.ebuild b/sci-libs/coinor-osi/coinor-osi-0.106.5.ebuild index 6c960477e52d..b2325fd77ebd 100644 --- a/sci-libs/coinor-osi/coinor-osi-0.106.5.ebuild +++ b/sci-libs/coinor-osi/coinor-osi-0.106.5.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-osi/coinor-osi-0.106.5.ebuild,v 1.1 2014/01/14 17:58:51 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-osi/coinor-osi-0.106.5.ebuild,v 1.2 2014/01/15 20:09:00 bicatali Exp $ EAPI=5 @@ -27,19 +27,9 @@ 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:\(libOsi.*_la_LIBADD.*=\).*:\1 $(top_builddir)/src/Osi/libOsi.la:g' \ - src/Osi*/Makefile.in || die - sed -i \ - -e 's:\(libOsi_la_LIBADD.*=\).*:\1 @OSILIB_LIBS@:g' \ - src/Osi/Makefile.in || die -} - src_configure() { local myeconfargs=( + --enable-dependency-linking $(use_with doc dot) ) if use glpk; then @@ -50,8 +40,7 @@ src_configure() { else myeconfargs+=( --without-glpk ) fi - PKG_CONFIG_PATH+="${ED}"/usr/$(get_libdir)/pkgconfig \ - autotools-utils_src_configure + autotools-utils_src_configure } src_compile() { @@ -59,9 +48,7 @@ src_compile() { } src_test() { - pushd "${BUILD_DIR}" > /dev/null || die - emake test - popd > /dev/null || die + autotools-utils_src_test test } src_install() { |