Cleanup, as-needed applied upstream

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

6 files changed, 31 insertions, 45 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/Manifest b/sci-libs/coinor-symphony/Manifest
index e096432e1692..de13e4693af6 100644
--- a/sci-libs/coinor-symphony/Manifest
+++ b/sci-libs/coinor-symphony/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST SYMPHONY-5.5.7.tgz 7628863 SHA256 7828620ebe240239f6392a23a54fbacdb39f91c6571f2b98346b5b42436a20f0 SHA512 a3ce66b0b1373c58024ce6840277423a1a3684af8e3179a777fbb33a8d266849ae1cde694a527c3776ff67ce0a5ae3c2bfe0dc29f4e0b3ca51ddc2b299eefb24 WHIRLPOOL aa43df2d558bb328b9d226e7e15f8164cfd18eeac326b6ecd9306887703f2b8619b0343750415b526cfba73eb78319b6509f266ec527fbbb4bb2c84ae134f553
-EBUILD coinor-symphony-5.5.7.ebuild 2355 SHA256 2e7abe8bc758f86bb44f66b98f1b4e67ca86af312682ead5e0ad2b5086b5392f SHA512 6328199b330e98b1d266e463633aa4ba873ce36ba187f39c9f6205e4bb2255073979938b499e3a36c3318e0d5c9d3b5bbe4906066eecb71bd1dc44c9aef42678 WHIRLPOOL 1817215fe71ef1cfee821d5769913172a68a77dff5c69f8b919ab5f154d2e1d0b98cba530870681a8632b043c7c8e6da57364bac6910af37c164676e30a77be9
-MISC ChangeLog 1375 SHA256 a1d868107793a673b80fd63c7af287dc38df5db69bf4fbc83e5245a33fee741f SHA512 d092efc756f9eb9ba4ed0fad7d8f5292f82c3bb5f8e03a7836a51742aaa62536585f73d1a86b805941b812c550364e2f944b3e144b639a4eedb10e90345f682a WHIRLPOOL a3d233b3ccaf29f9a8fac8ca2ba47373d6383c8e1d2c0f93c908403d6c6e047ba154fab4bd8f8a2849d26ffa6ed9c379e0293fb5f5b5808d291a128fab276a12
+EBUILD coinor-symphony-5.5.7.ebuild 1970 SHA256 5a4bd4e249fc4e7701f2356810c5bd1358e1ace721cae6314647543f54306542 SHA512 7b19ab239caa0d30faef05102efa6234521ae4b349d6c33332084e91dbbb182c817aaf84b146906ea67f23d4eb430322e864f35369416e2a85138dfb6a1bcd32 WHIRLPOOL 3afac505a4486bc03d1816bc132d7a43cf6825392558b2638f4ae4599a78d3817c0a5ac7096b7efc1c7b002efd6f1d1911ffd67ea22db0fa4bf2c5b5cb18f1c5
+MISC ChangeLog 1492 SHA256 325cc7719a20277c6f0fd15f3af47523f17e61552d8ddab42c56d973d2cdffa6 SHA512 9a3c1766138f4ba9c89d792f93ef4d4e3047d67026361275ef8e2814c82f55d8bfaaf96783447a66e0b6dc43ea9499143376f6ac1f4c6aa9ed96c64113de838e WHIRLPOOL a4388f9e5f4df507fb617e2d43cb7de9c0ca96e3093e596314c1efa0bc60c75ed93035bcdaf85523a70c4330b967b4cab14703d0474a2a4a4a1c8081fb1798b3
 MISC metadata.xml 735 SHA256 8945dd111786194cf7a885ec203befaa7fe80431a5d0e5417f6f06f8882733a9 SHA512 cf4e36e83aba67c4d454e761ef62a0fd37961bf2afafaef52b5cfc0c7649743d7ab2b01c04141d9c26f37f103972572c98994c622257c7a76e6717eb32f3f181 WHIRLPOOL 338ba61dfcc001d7cc640298df33681577a9959c89f0f403cc24854a840ca82059cc4523adf0c2c0d19dffad13abc7737801b3f0f61d99377f235d5192c8be20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLVtX0ACgkQ1ycZbhPLE2BirgCbB9BsEj26EFDRtb6SKYa6pryB
-4rYAoIaziw44su52PpoGd0599/V8NGK8
-=BLxg
+iEYEAREIAAYFAlLW6ZcACgkQ1ycZbhPLE2BZhwCePczoj5Gcel5xmAKjyWw4DlK2
+/fcAnj68QeKwJ1c/lN0eafASidcnB+Du
+=txxA
 -----END PGP SIGNATURE-----
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() {
diff --git a/sci-libs/coinor-utils/ChangeLog b/sci-libs/coinor-utils/ChangeLog
index ddc1ff211eb0..9ce997d68ab4 100644
--- a/sci-libs/coinor-utils/ChangeLog
+++ b/sci-libs/coinor-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/coinor-utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-utils/ChangeLog,v 1.1 2014/01/14 17:51:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-utils/ChangeLog,v 1.2 2014/01/15 20:00:22 bicatali Exp $
+
+  14 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  coinor-utils-2.9.11.ebuild:
+  Cleanup, as-needed as applied upstream
 
 *coinor-utils-2.9.11 (14 Jan 2014)
 
diff --git a/sci-libs/coinor-utils/Manifest b/sci-libs/coinor-utils/Manifest
index 13df05ba6e4a..f9a171dac55b 100644
--- a/sci-libs/coinor-utils/Manifest
+++ b/sci-libs/coinor-utils/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST CoinUtils-2.9.11.tgz 1740411 SHA256 9c2d9d8f8cb0e249bf3f050afeb02a1a95ad382f55ae98b59d8f7b9ab75cc80b SHA512 3cbbce47cda4d5f63338644853601bf0a3dd9b9388e71a7aea7fedd51dfc007134359e5f12f24d8f6135d86b77a88a95bcb88249b1ba880eb3cd9cf41d039424 WHIRLPOOL 8a2d2b2eea7c11d38f10449ac13bc9c70e1ac6e01469e2d4014d1206cbe48681d949509ec6cc0074e6e603f45152ead6145b6b19e2d2d6c5bf02b572f2174015
-EBUILD coinor-utils-2.9.11.ebuild 2145 SHA256 939f60774d4ca0303dc5eef7b9095524fe2bd979a78bb196d94b0cfba796dbae SHA512 f0bb3954cb5c2eba9326f6bd4c86cca3e7b8a7e269e8465c4e9cde512b445da603ceaa03941e5c1cbb7c2cfada9db8914f07f30c7fdede47c68401953da0caad WHIRLPOOL c667ed9b9872bc86e6b2b7d49f40e9e404388dd16946cf4015ff32d675df3a1fe815e496781af1a4d7574b658befd8e23cc966100f431639c997cee5591f804c
-MISC ChangeLog 1497 SHA256 78e13c882069785b71831d09d115cb74c4dd50b41875ab1cdfe6d987bdfd5517 SHA512 07dbef17462627487630a1ced3aff47dcc4c524e33a976f2f8eac379533b995a7c9150d7ea9bf0aaec172e2e38fe07f260ecc838fe963c17140e930347c51bad WHIRLPOOL 4ed7498b1a7268e575740e7df550ab89ace6d869397ba7c7e3e5bfd40e40086fe98b3adc56668e0657e6b582b6e2542471881704a180e54a785da68572c8d658
+EBUILD coinor-utils-2.9.11.ebuild 1868 SHA256 6737a0c3d134b1191f466d8c63a0eebbff16e79dced95809e9c336a8c4518ac1 SHA512 3f935fe75777edaa2f1d398626a21413dee2ef24c937a287874cf327391bd0aaa49229176956c4475ebd18d5fbfbb9df3a22cb46f3d5e2fc8d4268f46ee09cef WHIRLPOOL fe06fa20318dbd33c965857530b3948da9a96e045b7bc0ddd55f9ee7526cccd57dc411e490f95f411a6a59870b2c3a258d6bf6629a0b3493114797fdaa74d03c
+MISC ChangeLog 1624 SHA256 6c3bec21be3c2034e7046f4bbd1f51bcc27193857671b07dd74ecd227c3c903c SHA512 cdb5f3ace350c0d06811d2f2f590f0add642ff4f409829e1412bf389923fa582e43a9ec5e054214b7dca3c4e4e1a38376359b591ed48e0c2a54e59dc06af2047 WHIRLPOOL 18ca36a2dbafce8217cf8762fa1d670902b57946c66261c30f8c40fa396630b37e34ca8f88b8628e05018661103d9e49300d3c1673990ffe501d9932c05efad2
 MISC metadata.xml 542 SHA256 ccb5306312576ccb7dc85789733b26ce863d1c77d0295c8347973a4ba21b2ca2 SHA512 fbfbd8820e8d1fab34c5d1317bc2754a01d4dd9dad9158979b8024682aa80af0e0dbb0ef649632c5f7be7b9f6d3c782c06513b7cb59a39119f92abca3eb26f5e WHIRLPOOL f018d5bec9caeac06f06b72fa1973cb16adddf1ecfab722096bd0876b5c4e211c2277cf33462188bebf40b497a09ec13e3461e4fa9fdde07a4b08628b1b2d2ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLVeUAACgkQ1ycZbhPLE2CfvACfbKYxLUMGpdV41VDTunfdy3Vp
-5zIAoJ/TrdfBrlJqjeOADgRJiWLhA5bN
-=xnGp
+iEYEAREIAAYFAlLW6NgACgkQ1ycZbhPLE2AMswCgkG72OGMFmJcI6E1m3dXMw95u
+QIwAoLE0tIyLuYR4OLyULVVTGXR20OVM
+=vJKm
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/coinor-utils/coinor-utils-2.9.11.ebuild b/sci-libs/coinor-utils/coinor-utils-2.9.11.ebuild
index 2ca6758adf1d..06d09b1b8578 100644
--- a/sci-libs/coinor-utils/coinor-utils-2.9.11.ebuild
+++ b/sci-libs/coinor-utils/coinor-utils-2.9.11.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-utils/coinor-utils-2.9.11.ebuild,v 1.1 2014/01/14 17:51:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-utils/coinor-utils-2.9.11.ebuild,v 1.2 2014/01/15 20:00:22 bicatali Exp $
 
 EAPI=5
 
@@ -31,16 +31,9 @@ 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:\(libCoinUtils_la_LIBADD.*=\).*:\1 @COINUTILSLIB_LIBS@:' \
-		src/Makefile.in || die
-}
-
 src_configure() {
 	local myeconfargs=(
+		--enable-dependency-linking
 		$(use_enable zlib)
 		$(use_enable bzip2 bzlib)
 		$(use_with doc dot)
@@ -63,18 +56,15 @@ src_configure() {
 	else
 		myeconfargs+=( --without-lapack )
 	fi
-	PKG_CONFIG_PATH+="${ED}"/usr/$(get_libdir)/pkgconfig \
-		autotools-utils_src_configure
+	autotools-utils_src_configure
 }
 
 src_compile() {
 	autotools-utils_src_compile all $(use doc && echo doxydoc)
 }
 
-src_test() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	emake test
-	popd > /dev/null || die
+psrc_test() {
+	autotools-utils_src_test test
 }
 
 src_install() {