Fix underlinking #495212

Package-Manager: portage-2.2.10/cvs/Linux x86_64

5 files changed, 74 insertions, 8 deletions

diff --git a/app-benchmarks/acovea/ChangeLog b/app-benchmarks/acovea/ChangeLog
index b452fdacd279..7f9db5f4f304 100644
--- a/app-benchmarks/acovea/ChangeLog
+++ b/app-benchmarks/acovea/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/acovea
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/ChangeLog,v 1.19 2010/09/06 23:22:02 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/ChangeLog,v 1.20 2014/07/01 07:54:17 patrick Exp $
+
+*acovea-5.1.1-r1 (01 Jul 2014)
+
+  01 Jul 2014; Patrick Lauer <patrick@gentoo.org> +acovea-5.1.1-r1.ebuild,
+  +files/acovea-5.1.1-underlinking.patch, acovea-5.1.1.ebuild:
+  Fix underlinking #495212
 
   06 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> acovea-5.1.1.ebuild,
   +files/acovea-5.1.1-glibc-212.patch:
@@ -64,4 +70,3 @@
 
   07 May 2004; Daniel Ahlberg <aliz@gentoo.org> acovea-4.0.0.ebuild:
   Initial import.
-
diff --git a/app-benchmarks/acovea/Manifest b/app-benchmarks/acovea/Manifest
index 01b98a40359c..4751ced7c642 100644
--- a/app-benchmarks/acovea/Manifest
+++ b/app-benchmarks/acovea/Manifest
@@ -3,7 +3,9 @@ AUX acovea-5.1.1-free-fix.patch 267 SHA256 ecfa5e0620ad8d07c67fa4cd1dc49291b935f
 AUX acovea-5.1.1-gcc44.patch 281 SHA256 f492170e2b95eedd669ce23ba69dafa500b746c2936fb2be5e0ff88dfcbe86ca SHA512 90b5d7237cb1387248b4e1a688df228bb7c258830654fea661b121a481e81bc201391be11eeaea7bb05a537fa59fdac5d278f6f5fdb596c228d8ed10ce05d267 WHIRLPOOL 049d999e7a669a47f07fc35f751a1a18f91c5a84822dab5e95d369e6001aa805f8da858eb924511471c75b71ba4e7c075adf761ee6a5214134b05b8ec401e6f2
 AUX acovea-5.1.1-glibc-212.patch 231 SHA256 6f0e34d65bf4a4938357f04489360ff555192c13f66eda1244ceaeaddf7fce83 SHA512 c126096e8d92a8954136ef30f29aef110c427079d1fcf5b836ac2e53a9c6903b76675e3c5e2f3caf18ef73754fdd5d314d55665fa94c6bdd782faa4b97770775 WHIRLPOOL 119d32d85921c31efee79f5d5b467ad5d70b304a87987ee4554577ea2abc0d227fe8fcc61cb8b6254d009a622f65350d8830f7975e7c816f8160a166eadae528
 AUX acovea-5.1.1-libevocosm.patch 3527 SHA256 18ae32d3cfb70265d5a30b48d6111fc177ccb446b16416d39f3de425a1a40ee0 SHA512 f5161d0b9b76dbaea3708c3a2947966e13da12e9430c347efe75e069dff769812628c6225f42263e3a735ca829e38e4329ab14e80d1cfffce98ca8b61b03cafb WHIRLPOOL a9e75d01836053f5ac2eb0a7a835c2e9c313d016eb9cff97433d0e1d53a7c93d208b75aeded1b6a617f328e7c140d49027c1b6d65be4cabaa94fd46f9252e6c2
+AUX acovea-5.1.1-underlinking.patch 327 SHA256 4bcf41bd35dc04048eaef383c2beb67306850ddc9499e8afe70cdcd1ddf8094d SHA512 cc185181899cef9a6e1b830663a179b61170a47cbc1568ee6fd71756cee3ccc605a4568528384b9b24a7b7b4758e70f5bcf523d4ea044b31667bb024293eb883 WHIRLPOOL 9068015e8133626d9d170f46e009c79ae498ccb680b5657f6ff8e2d6094f6fdbccb7f07ef54ed8402fa7a33e55cbcb3b4b98beb57b0c33e3f395ac23c7ee3a74
 DIST libacovea-5.1.1.tar.gz 363048 SHA256 e84167ac683e6bf7720bd3edf1fc60e77961eb489d31fa2c1d0a34e7d67ae079 SHA512 47ac88d713004ccdbf31c29bd5ead3e9d869eee262f2c12e12bf9aa7ec177d2c1e175908704cd5463b314752692edcd98d69408dbeb5873caff1745535a3a365 WHIRLPOOL 420b6ec243a0e94a532091c1efebd37e42775db7c3402066849003f5325bf81ff0b87c64e6d0771dc1ccd6615484aebe1d40fec5e7ab19879596454a3cb95a4f
-EBUILD acovea-5.1.1.ebuild 1177 SHA256 6bb0a7d0fa1d0cac4c99fe4fe952fbc888f3fc27f6b9b5d9f37ec65d417d797e SHA512 844aa4d8d00f41c0df660922b3510b772110011dee3ae32117df805cff333417c3ed69841ee12900e1d5b6552d54782b946095e5eed1449e87b207d6fd953d60 WHIRLPOOL 359f806395e5117f06af68728557171d2d7ea1b1d105b568aff762cb8c0664f1cfe92934afa0558d32cd5dfd1178c3a9f36002d4620ea4a1f77cba224788ee1d
-MISC ChangeLog 2631 SHA256 d795a6b130b05b240126728a0e6e0d8d11a296e2fb01767b05f5084b9d5db613 SHA512 941f5568439e21766c2afab872cec40cf063549b878bedfe763140a5719520bc263aaa9c4059cd00cdc4f7a3577d1a0f2c6ca1822882e1b8e575f832dc1c360e WHIRLPOOL 96c9f8a1b79499f624429d479d280c4f42d4ea1a14e35854fd04f46995d2da2c97ed4fb32d22a1c8065e59d980e4d5157aba15bf11e15a697ec8a773bec41be7
+EBUILD acovea-5.1.1-r1.ebuild 1222 SHA256 6646d02daec29c29159f354f67111e807915f8e1df65eb7e6152bb98983f9e6e SHA512 a68d032f30dd17fa67f3c9be37cbefa6f6a587d0bff367967e5ebc3ed4ae0446a5994e532b1c93359b9dbad78fe6ec9f78024479aea5bac683d8933d3b810c3f WHIRLPOOL b95ab10aa536cd0b1096bc71799e829a713af6853df5c7a5707cce3b463d4242458b62020fcbf9dabda7b8d9081c6b8ba36b760d91d962887bdad8293bf7b010
+EBUILD acovea-5.1.1.ebuild 1175 SHA256 7839119fe5cb0829397389a1d8b937fcc52dfad167e0c29087ec708153dcd063 SHA512 eae971787b4029cef8dd1b6895c771ff427191679aa027179f461f3340122a8522f776a75b3f2c475232edd897a5aacc3ff7667e6f3d27bebcac3044419e37ee WHIRLPOOL abee13c2d251780101e77b526e72fcbf4691cf339241a8e70b109d0ecba88aa18f13c05f4cfb82e88edbce0ffd0ac658b9146cb63d7a1245438f54bb61f1dd5e
+MISC ChangeLog 2826 SHA256 9add40b5e316bd5c0767393d5f9200e95df585ba147352ae2e898d096947149e SHA512 5cac45fab42e73c6d6745093117c1c67a8b25a7becda5a51b7f1e0262e31065a9780971cb2cdc2a337fb87d5817f474793e8bec606df79c02b92870e26aae9b6 WHIRLPOOL e8c45c053f494ef28593b46f9af40bde23a87b2fc89f1fdc9c0e616341c6709be5e3f360549d17bd509cf01e06fa1dda35945069dd98f609937054e88ed44831
 MISC metadata.xml 258 SHA256 6b80bacd73563c7530978566cf2c81ca5fdb9eef54058a4f75ee0e272043283c SHA512 de6865f5cc5897046336611a5b746003865f531a17178239392bc730edf7bc03eb4d3b88f69a2a10e6cf7d1902b80a2cbfb60e4956e54b1348e148d811fe3e1d WHIRLPOOL 1b925f9c7234b04d61c53aad5b887600dd9ed4c59bb82da0cd6ff006e360a0af4502b613c103fda81cc9cd8b4afbe7d84124bd54654085c22cb9008e93fa34d0
diff --git a/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild b/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild
new file mode 100644
index 000000000000..0ed40990520b
--- /dev/null
+++ b/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild,v 1.1 2014/07/01 07:54:17 patrick Exp $
+
+EAPI=2
+WANT_AUTOMAKE=1.9
+inherit autotools eutils
+
+DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm"
+HOMEPAGE="http://www.coyotegulch.com/products/acovea/"
+SRC_URI="http://www.coyotegulch.com/distfiles/lib${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libcoyotl-3.1.0
+	>=dev-libs/libevocosm-3.1.0
+	dev-libs/expat"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/lib${P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-free-fix.patch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-glibc-212.patch \
+		"${FILESDIR}"/${P}-underlinking.patch
+
+	if has_version ">=dev-libs/libevocosm-3.3.0"; then
+		epatch ${FILESDIR}"/${P}-libevocosm.patch"
+	fi
+
+	eautomake
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog NEWS README
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}
diff --git a/app-benchmarks/acovea/acovea-5.1.1.ebuild b/app-benchmarks/acovea/acovea-5.1.1.ebuild
index 6c38340c1cf8..0a9913c32165 100644
--- a/app-benchmarks/acovea/acovea-5.1.1.ebuild
+++ b/app-benchmarks/acovea/acovea-5.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/acovea-5.1.1.ebuild,v 1.10 2010/09/06 23:28:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/acovea-5.1.1.ebuild,v 1.11 2014/07/01 07:54:17 patrick Exp $
 
-EAPI=2
+EAPI=5
 WANT_AUTOMAKE=1.9
 inherit autotools eutils
 
diff --git a/app-benchmarks/acovea/files/acovea-5.1.1-underlinking.patch b/app-benchmarks/acovea/files/acovea-5.1.1-underlinking.patch
new file mode 100644
index 000000000000..06ef410b6cc6
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-underlinking.patch
@@ -0,0 +1,10 @@
+diff --git a/cmdline/Makefile.am b/cmdline/Makefile.am
+index f3c763e..8e18d9c 100644
+--- a/cmdline/Makefile.am
++++ b/cmdline/Makefile.am
+@@ -7,4 +7,4 @@ bin_PROGRAMS = runacovea
+ 
+ runacovea_SOURCES = runacovea.cpp
+ 
+-LIBS = -L../libacovea -lacovea -lcoyotl -levocosm
++LIBS = -L../libacovea -lacovea -lcoyotl -levocosm -lbrahe