diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2014-01-15 20:03:34 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2014-01-15 20:03:34 +0000 |
| commit | e24b4465f65b7340e927876ecfaa3fe1cb67acf2 (patch) | |
| tree | 6120cc6cbcc8cce79447e01c33fb9f4803373a81 /sci-libs | |
| parent | Replaced to newer version (upstream wrong numbering) (diff) | |
| download | gentoo-2-e24b4465f65b7340e927876ecfaa3fe1cb67acf2.tar.gz gentoo-2-e24b4465f65b7340e927876ecfaa3fe1cb67acf2.tar.bz2 gentoo-2-e24b4465f65b7340e927876ecfaa3fe1cb67acf2.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-symphony/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild | 24 |
2 files changed, 11 insertions, 19 deletions
diff --git a/sci-libs/coinor-symphony/ChangeLog b/sci-libs/coinor-symphony/ChangeLog index 903b298376c3..9cc4679093d1 100644 --- a/sci-libs/coinor-symphony/ChangeLog +++ b/sci-libs/coinor-symphony/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/coinor-symphony # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-symphony/ChangeLog,v 1.1 2014/01/14 22:09:00 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-symphony/ChangeLog,v 1.2 2014/01/15 20:03:34 bicatali Exp $ + + 15 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> + coinor-symphony-5.5.7.ebuild: + As-needed applied upstream *coinor-symphony-5.5.7 (14 Jan 2014) diff --git a/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild b/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild index 40c91416df8d..34518e73b652 100644 --- a/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild +++ b/sci-libs/coinor-symphony/coinor-symphony-5.5.7.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-symphony/coinor-symphony-5.5.7.ebuild,v 1.1 2014/01/14 22:09:00 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild,v 1.2 2014/01/15 20:03:34 bicatali Exp $ EAPI=5 @@ -32,19 +32,10 @@ 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:\(libOsiSym_la_LIBADD.*=\).*:\1 $(top_builddir)/src/libSym.la:' \ - src/OsiSym/Makefile.in || die - sed -i \ - -e 's:\(libSym_la_LIBADD.*=\).*:\1 @SYMPHONYLIB_LIBS@:g' \ - src/Makefile.in || die -} - src_configure() { - local myeconfargs=() + local myeconfargs=( + --enable-dependency-linking + ) if use glpk; then myeconfargs+=( --with-glpk-incdir="${EPREFIX}"/usr/include @@ -52,8 +43,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() { @@ -70,9 +60,7 @@ src_compile() { } src_test() { - pushd "${BUILD_DIR}" > /dev/null || die - emake test - popd > /dev/null || die + autotools-utils_src_test test } src_install() { |