summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/coinor-cbc')
-rw-r--r--sci-libs/coinor-cbc/ChangeLog5
-rw-r--r--sci-libs/coinor-cbc/Manifest10
-rw-r--r--sci-libs/coinor-cbc/coinor-cbc-2.8.8.ebuild27
3 files changed, 13 insertions, 29 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/Manifest b/sci-libs/coinor-cbc/Manifest
index de4c49c437af..5e6d9e43d9e9 100644
--- a/sci-libs/coinor-cbc/Manifest
+++ b/sci-libs/coinor-cbc/Manifest
@@ -2,13 +2,13 @@
Hash: SHA256
DIST Cbc-2.8.8.tgz 8226460 SHA256 5f73db37c0a048171a24725c03235314ee7d4d446f9daff8720ded2b94e95b6a SHA512 d6dd391b5ea82b6d4bce42450955c30aecf862bc5d341e4c6dfb0bf8d98ec162519a0bdb0549a4d2417466c99efd2b99041a8554acd58868b8e4c8611b419b20 WHIRLPOOL 84ff4d80769b2cf913bde66766a9384073a2ed9f26c4003e069c65374a718a968a886f7848747813d0e718a483b7dfd2dd9a6823dfe16a8db1f9baa4902f0f7e
-EBUILD coinor-cbc-2.8.8.ebuild 2389 SHA256 20530b6fb6740a8a51a507df9d1bdbd9c43477167f8f12a45a96fa6291139d62 SHA512 f3a21557dba860b3a65486a70dcfaf6645b5287e4f304a0288fe23507539cb59e53b47f80f87c2208e6f395a5fd7568716197daee141b84599ebe76b08835639 WHIRLPOOL 4bc702d817797fb5eaf7be55f5fb0a5c947f2492b3491c6c475ecd3026f0aa81373ea77066fecc5eea4fadaf5757dce915b9bfc9d67d8f1c820a3c856816fbd8
-MISC ChangeLog 1424 SHA256 d82ac79cf2f04a8fd94e5aec0ab8bfe33dccc007fc3f5ca44a55c26b65007663 SHA512 85415745d3df9feed55dbabe8385a4e6d855c98305a4fd459a8f5915cb9634df09b6b9f727e5ce7509577980e54feccfacc54720aabdc8f2a53de80aa084c50c WHIRLPOOL b9e50f778e6f77b49f00aa26ff875dc3e49af18993c1ca78a665b1baad1e4debbfeea460c719031680b07cc61217624bd4326827f98dc4465eaf25c56cf8c875
+EBUILD coinor-cbc-2.8.8.ebuild 1706 SHA256 3737fb84ab3795d9d63fdd014d64ca93e8d298ef82314f4e249e3569aab53ed7 SHA512 9fbbd3d0cbc981936a7eeee34aecbce810d3546ea08c871673e6935df1368af3c1937f28651dc094993ea971de83f0bb13746e82fb8c4458fc697c71ea63f475 WHIRLPOOL dc9a5c1898e1eea2d93a7b436b5eea49511b1581759f9aef18f7c3c77e6568e5d2b1bfa3c9e4107f1ce00079517a201f9d5c9d66d2f6f36895fa9b83b336c1ab
+MISC ChangeLog 1543 SHA256 a2a65dd8e1dc778171fe5cd6640479d89d5101604b3711c6f68e16ee9b0eaba1 SHA512 5a09a49786f5cb33ef08a8832fa060d597946622076e1f139f370ba2ca0e4e61ebf06a102bbf44474df95a9f6960373eff76341c8b5339e6631a50cebbe62171 WHIRLPOOL 517fcaa60e96a3f88edb3531eef22927ddef29b187b7b83c35c0cfc1500937313300ef6532ca48ebd3f893dfc86a0f3f5eec49c07480016d2b214bf2fb5f6778
MISC metadata.xml 441 SHA256 cc5f99454ae38b85a0dca11b7182fcd8670b1a8b76296f50421a7e3e2ed0daeb SHA512 b8ba3cbbd95a08268af82c219a48a2c67e60beef14dbfaff767194da584dfcd0863b5f8328c6e8f0bdfd83cb1d1c5353ab59d956ea43e07c0e8491b0774d3829 WHIRLPOOL 7b73cc2d5339adf5c83cea8c1ac9e2b77df03dd71dea7f9359fb41cb35963613ae5b19cb309cc9ae0e9109487b6e5784ed02209ac9857bd4ed9727874bb3858c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlLViMEACgkQ1ycZbhPLE2BPtgCgnrJHzSso+nEeTwWc03Q6a1e2
-52AAnR5OYKbQTv20NDyThT86Oj6WcbyO
-=Amse
+iEYEAREIAAYFAlLW4usACgkQ1ycZbhPLE2DB2ACeLdYJ+tdCt3F+cOLrIG55w7dv
+PUYAn2m3XheVPW4g5IVcG1iczwm/UkR/
+=5ev5
-----END PGP SIGNATURE-----
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() {