diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2014-01-15 20:05:12 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2014-01-15 20:05:12 +0000 |
| commit | 837ca6a83a22e4a0a40ba5aba8f84335011fab05 (patch) | |
| tree | 2c279734edae6fea586eabec552bf0f6b0cf0d1e /sci-libs | |
| parent | Cleanup, as-needed applied upstream (diff) | |
| download | gentoo-2-837ca6a83a22e4a0a40ba5aba8f84335011fab05.tar.gz gentoo-2-837ca6a83a22e4a0a40ba5aba8f84335011fab05.tar.bz2 gentoo-2-837ca6a83a22e4a0a40ba5aba8f84335011fab05.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-dylp/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/coinor-dylp/coinor-dylp-1.9.4.ebuild | 23 |
2 files changed, 10 insertions, 19 deletions
diff --git a/sci-libs/coinor-dylp/ChangeLog b/sci-libs/coinor-dylp/ChangeLog index 1e388c98ad0d..0b5552a30b97 100644 --- a/sci-libs/coinor-dylp/ChangeLog +++ b/sci-libs/coinor-dylp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/coinor-dylp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-dylp/ChangeLog,v 1.1 2014/01/14 18:03:16 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-dylp/ChangeLog,v 1.2 2014/01/15 20:05:12 bicatali Exp $ + + 15 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> + coinor-dylp-1.9.4.ebuild: + As-needed applied upstream *coinor-dylp-1.9.4 (14 Jan 2014) diff --git a/sci-libs/coinor-dylp/coinor-dylp-1.9.4.ebuild b/sci-libs/coinor-dylp/coinor-dylp-1.9.4.ebuild index 5465a7493040..5813a1f13397 100644 --- a/sci-libs/coinor-dylp/coinor-dylp-1.9.4.ebuild +++ b/sci-libs/coinor-dylp/coinor-dylp-1.9.4.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-dylp/coinor-dylp-1.9.4.ebuild,v 1.1 2014/01/14 18:03:16 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-dylp/coinor-dylp-1.9.4.ebuild,v 1.2 2014/01/15 20:05:12 bicatali Exp $ EAPI=5 @@ -17,7 +17,7 @@ SLOT="0/1" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples static-libs test" -RDEPEND="sci-libs/coinor-osi" +RDEPEND="sci-libs/coinor-osi:=" DEPEND="${RDEPEND} virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) @@ -25,23 +25,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:\(libOsiDylp_la_LIBADD.*=.*\)$:\1 $(top_builddir)/src/Dylp/libDylp.la @OSIDYLPLIB_LIBS@:g' \ - src/OsiDylp/Makefile.in || die - sed -i \ - -e 's:\(libDylpStdLib_la_LIBADD.*=.*\)$:\1 @DYLPLIB_LIBS@:g' \ - src/DylpStdLib/Makefile.in || die -} - 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() { @@ -49,9 +38,7 @@ src_compile() { } src_test() { - pushd "${BUILD_DIR}" > /dev/null || die - emake test - popd > /dev/null || die + autotools-utils_src_test test } src_install() { |