From cd9937d7495fe1afed60e23f4c25ae61eb006b09 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Wed, 15 Jan 2014 20:07:37 +0000 Subject: Cleanup, fixed examples install and removed as-needed hack, applied upstream (Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) --- sci-libs/coinor-smi/ChangeLog | 5 ++++- sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild | 24 ++++++++---------------- 2 files changed, 12 insertions(+), 17 deletions(-) (limited to 'sci-libs/coinor-smi') diff --git a/sci-libs/coinor-smi/ChangeLog b/sci-libs/coinor-smi/ChangeLog index 69e9516cbb2c..1094b003abb5 100644 --- a/sci-libs/coinor-smi/ChangeLog +++ b/sci-libs/coinor-smi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-libs/coinor-smi # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-smi/ChangeLog,v 1.1 2014/01/14 22:06:00 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-smi/ChangeLog,v 1.2 2014/01/15 20:07:37 bicatali Exp $ + + 15 Jan 2014; Sébastien Fabbro coinor-smi-0.93.4.ebuild: + Cleanup, fixed examples install and removed as-needed hack, applied upstream *coinor-smi-0.93.4 (14 Jan 2014) diff --git a/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild b/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild index 3f91fea50c92..fb16c74074fc 100644 --- a/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild +++ b/sci-libs/coinor-smi/coinor-smi-0.93.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-smi/coinor-smi-0.93.4.ebuild,v 1.1 2014/01/14 22:06:00 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild,v 1.2 2014/01/15 20:07:37 bicatali Exp $ EAPI=5 @@ -32,17 +32,11 @@ 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:\(libSmi_la_LIBADD.*=\).*:\1 @SMI_LIBS@:g' \ - src/Makefile.in || die -} - src_configure() { - PKG_CONFIG_PATH+="${ED}"/usr/$(get_libdir)/pkgconfig \ - autotools-utils_src_configure + local myeconfargs=( + --enable-dependency-linking + ) + autotools-utils_src_configure } src_compile() { @@ -54,16 +48,14 @@ src_compile() { } src_test() { - pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die - emake test - popd > /dev/null || die + autotools-utils_src_test test } src_install() { use doc && HTML_DOC=("${WORKDIR}/${MYPN}-${PV}/doxydoc/html/") autotools-utils_src_install if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r Examples/* + insinto /usr/share/doc/${PF} + doins -r examples flopcpp_examples fi } -- cgit v1.2.3-65-gdbad