Cleanup, as-needed applied upstream

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

3 files changed, 13 insertions, 21 deletions

diff --git a/sci-libs/coinor-clp/ChangeLog b/sci-libs/coinor-clp/ChangeLog
index 61fe0e5e3e9a..4aba3118ead6 100644
--- a/sci-libs/coinor-clp/ChangeLog
+++ b/sci-libs/coinor-clp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/coinor-clp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-clp/ChangeLog,v 1.2 2014/01/14 21:45:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-clp/ChangeLog,v 1.3 2014/01/15 19:37:56 bicatali Exp $
+
+  15 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  coinor-clp-1.15.6-r1.ebuild:
+  Cleanup, as-needed applied upstream
 
 *coinor-clp-1.15.6-r1 (14 Jan 2014)
 
diff --git a/sci-libs/coinor-clp/Manifest b/sci-libs/coinor-clp/Manifest
index 31bade9ae2a2..501a9b1b68dc 100644
--- a/sci-libs/coinor-clp/Manifest
+++ b/sci-libs/coinor-clp/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 AUX coinor-clp-1.15.6-mpi-header.patch 323 SHA256 ba8e50a75385f54ba9cf3bba3f6c8a7171a94161369388dddd33824da6a0a55d SHA512 1f18e00c1a303cffa0ec6244bf1f5dbac83f0a73d1c82f4bf7a4f4df3ce581012a47b044f1d61c140a282e2d262403e76be49892cccec41b191f02edc6fa63a3 WHIRLPOOL 18b7e7916797f5923956d1daa8f69ae28d0987642683e59da26bc1f79ddca2479057334217cb728c17050bc101de43fdfb4c1f85635deb8a944e6beae0c43d76
 AUX coinor-clp-1.15.6-overflow.patch 349 SHA256 e2fbea8a9e6d81e31f5c1b29016b15d64d648979096e2c6fdeb7c335b7fe95bc SHA512 bc467ff47e0c963aa95c84c3321038327ce4bd99119ea7d66337a60aa329ad7ee8c774aa0405c6e089b081aba0c1e3be577661a7425519e8d56a9e7b05cbb01f WHIRLPOOL 67216f2d8a891cd194ce887a9d35c3554156353bbbbbc16203fc9a52a0ae154bccbb8812c984ed98ae2bf4053b4cf1c96805d8361e1891e9117e13cb3cc54244
 DIST Clp-1.15.6.tgz 5644504 SHA256 4f1ff52f7b471d795d395f561bb10cc2d5a11ecd151bc5329f6f60d448b8385f SHA512 a0da0cc5dcdd409c67cb67dd0f126a3d96bf59851543e7e08adbdbf01012a25905b58ded66aac50b06462ee3a147bed912740c00681417f8c228992a917748db WHIRLPOOL 0712972a59790daac6ddbae1b53458361e4f324f84bb5706b4d59e46eb538a69b22b1e236b550fdaa20201fd5adcc33a8f69f296a9ce022a15ea93b73897833c
-EBUILD coinor-clp-1.15.6-r1.ebuild 3282 SHA256 b183d4e83e5838204ad645b50c44d2d0cf76c1d07193c8dc57c8998b621b082d SHA512 ab343ca0164be8feeb0e9eb2ea95002f9d41ac1ee64c9725456789620130adad146938490cb322453137a70b33501a884a9b79c4dcf950da406a3533db5cda73 WHIRLPOOL f8d5ab27fa196ea2159288fc86bd785e3c30065bed55e07246e9da6c3791b7e6c4b014197813ecfaee87b97181bdd2d2552b0602a2f5e61098c44beb20367360
-MISC ChangeLog 2047 SHA256 d44042e76be7bf6ea9d15d1f4b9a0869e89a6d5658a7137fe11ea84a2bc76795 SHA512 3d29e280ebc6921711937e74391807ce63421c7f4a281798561360d035d827ee417ec5747adb793035861f9c4abdedd22e6de780cc0754eaa39c80a1cd12b417 WHIRLPOOL 05123ae197dd87386fb9d173f925184fc4739c87ba64b596d0111eb1871a0cbbfec6605b36391d24ea96ac83ba637bb3bef2a64eaffb71ba070a23e2f92c7c6a
+EBUILD coinor-clp-1.15.6-r1.ebuild 2884 SHA256 bebb996024acc92291df405938cfb53e312d7e3fa28da4b155272749e2ec8c6b SHA512 9bbd97393d64469969e90162346441b41f26c48c09d4eda13c303d97675fdeb371f95b0124b059e8c798af59796c57cfbb4ce488f9fb9c4622dc4eca840327a4 WHIRLPOOL 77e662a9b10246ca921e296df21981e1bbdf456590cf90755edac12acb78101a923a4c9ba8593ba257b5eb6faf210c478f33cc3526916056fc4699e9e36c376f
+MISC ChangeLog 2172 SHA256 1449731fd364258726a9a410dca08f22262ab4127508992fbf3f8592984e6456 SHA512 abacfb5c595214be63181b6214e43b53a2a9da0c05dd34d5a456878806f6a60f364a5041dc64224d601b6bf35e37f7368a20ab00d43eda67f602b8735b07d131 WHIRLPOOL 14c064a1eae2d1c82bdbf4f789ca357e18953c32b8f2aade12be143ff469608f4a5512c975acb3e30d11d474a955ad4ab32610012cd5753d8da96d90cde91174
 MISC metadata.xml 877 SHA256 babe479f415a9be7b4b9094f29626f0e16e16526e4176eda50a6a6730409a3a9 SHA512 748f995e850bb79fb2bacc55e7028d12f962e6f4e1194beefa69d4919541e1252fbe1ae9407a8982c439a5ae1782da9fd2072b8108c74e3ff4ca8d7ae15cef12 WHIRLPOOL 17cfa896908a486f6e54093825b9d92c68606aa4c50f9498d45516828e851703159a2760fec57a9bb15e42b820c33a6ea1a2c742b572c8d7fb2243d11d0eef6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLVsA0ACgkQ1ycZbhPLE2BP8ACgsMjtATL02dHd8R3GktzcieXi
-LhoAnjrr2JeU9w2G+4uPWqBXma0YTMnC
-=R8ex
+iEYEAREIAAYFAlLW45UACgkQ1ycZbhPLE2ANHQCfYk11KeH2HBu9tukFDIdUWsLz
+H8oAn0S94dd8Bh0kfvJk43IjxNIldRBf
+=DdkL
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild b/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild
index ba084612dc1c..936cbc6cadaa 100644
--- a/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild
+++ b/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.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-clp/coinor-clp-1.15.6-r1.ebuild,v 1.1 2014/01/14 21:45:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild,v 1.2 2014/01/15 19:37:56 bicatali Exp $
 
 EAPI=5
 
@@ -37,14 +37,6 @@ PATCHES=(
 )
 
 src_prepare() {
-	# as-needed fix
-	# hack to avoid eautoreconf (coinor has its own weird autotools)
-	sed -i \
-		-e 's:^#\(libOsiClp_la_LIBADD.*=\).*:\1 $(top_builddir)/src/libClp.la:g' \
-		src/OsiClp/Makefile.in || die
-	sed -i \
-		-e 's:\(libClp_la_LIBADD.*=\).*:\1 @CLPLIB_LIBS@:g' \
-		src/Makefile.in || die
 	if has_version sci-libs/mumps[-mpi]; then
 		ln -s "${EPREFIX}"/usr/include/mpiseq/mpi.h src/mpi.h
 	elif has_version sci-libs/mumps[mpi]; then
@@ -89,9 +81,7 @@ src_configure() {
 	else
 		myeconfargs+=( --without-mumps )
 	fi
-
-	PKG_CONFIG_PATH+="${ED}"/usr/$(get_libdir)/pkgconfig \
-		autotools-utils_src_configure
+	autotools-utils_src_configure
 }
 
 src_compile() {
@@ -101,9 +91,7 @@ src_compile() {
 }
 
 src_test() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	emake test
-	popd > /dev/null || die
+	autotools-utils_src_test test
 }
 
 src_install() {