clean cruft

Package-Manager: portage-2.2_rc75/cvs/Linux x86_64

6 files changed, 26 insertions, 20 deletions

diff --git a/app-benchmarks/acovea/Manifest b/app-benchmarks/acovea/Manifest
index 5727ba3f1830..2d3e8c868de2 100644
--- a/app-benchmarks/acovea/Manifest
+++ b/app-benchmarks/acovea/Manifest
@@ -1,9 +1,9 @@
-AUX acovea-5.1.1-asneeded.patch 517 RMD160 2296fbb0f51978d762c404781defd046a15f7870 SHA1 4e319f97eda12087fab021f7260dd0ad6b7ff2cb SHA256 1efc7bc4ca24e65d6f7aeae0cc33f54f88c48a05e73a31eda3603dd36b540226
-AUX acovea-5.1.1-free-fix.patch 343 RMD160 d2b571fe6d6c056d39d1c1c1be523c933061c91d SHA1 76121bfe71cef485005a09d681f8cbd24ed5bd6d SHA256 2c5793a2a096300d53ae51d7d99254a808f397b4dc1fb9428005d4b826bd3853
-AUX acovea-5.1.1-gcc44.patch 488 RMD160 80d443015a6c1acd915c510d9b3338149c7fd655 SHA1 77e25e872343b597f27a6e13f1cd9c541734d430 SHA256 98a6e1994e32f535e631d74e624eb3e87d024eb585d50cd1ca049e4a15d2af46
+AUX acovea-5.1.1-asneeded.patch 365 RMD160 65f6ae0ed32acb4a42358349ab76367f93f0b96a SHA1 297b2185588beb9a9a21c039f6509a9b9e55872c SHA256 f588beca58a484c73cb7430ba2315d61cb7de8bb0655a63046d28fb4fecb4a42
+AUX acovea-5.1.1-free-fix.patch 267 RMD160 30c9fa7fc6c8a0a12a3da7dd60f41cb6c74521b7 SHA1 9aaec7a2e4d317f4534a480aca8a1d67c766323b SHA256 ecfa5e0620ad8d07c67fa4cd1dc49291b935fce36231814d378e5af8520dc76c
+AUX acovea-5.1.1-gcc44.patch 281 RMD160 b30db166e7df11951d58c1fa5f108a1188241cba SHA1 6165df1f23ba08dc7d66cabf3721fd81e7401c71 SHA256 f492170e2b95eedd669ce23ba69dafa500b746c2936fb2be5e0ff88dfcbe86ca
 AUX acovea-5.1.1-glibc-212.patch 231 RMD160 2ec39812b7cfa8a3fa3935e1541f6a4a269563ec SHA1 8d233ca69addb372a7d3203ee60b4c251f89a940 SHA256 6f0e34d65bf4a4938357f04489360ff555192c13f66eda1244ceaeaddf7fce83
-AUX acovea-5.1.1-libevocosm.patch 3596 RMD160 cfc94b833af37a4896f0332b772077bf31b068df SHA1 ee7c349b0e77a1c22300d5ba5f6809b47f9b8469 SHA256 6c8755a5a68958567912d896af5ab69686b56fb337bb7a24034ae9db8b18b818
+AUX acovea-5.1.1-libevocosm.patch 3527 RMD160 862254a3e35fd2293f48f2b99874d23b6d73c0f0 SHA1 f802a4264a2cdabdad9164fe3aa0d94b08dc6214 SHA256 18ae32d3cfb70265d5a30b48d6111fc177ccb446b16416d39f3de425a1a40ee0
 DIST libacovea-5.1.1.tar.gz 363048 RMD160 1baad6a9cd1c536243544d62c6479381d7e5ae04 SHA1 5bfb06cb25d1bab1c5f5f30104b67e5d64c5f2ae SHA256 e84167ac683e6bf7720bd3edf1fc60e77961eb489d31fa2c1d0a34e7d67ae079
-EBUILD acovea-5.1.1.ebuild 1021 RMD160 3ed2d8034a133f051f29f9e3dce667a84e826a3d SHA1 92fb4075f8a7062c20d2a020db2e8088ebd50c5e SHA256 01ec35c102d0374b21eeb76d67f30162b8c20a96aefc6f96e5c2096fd2e5f4e8
+EBUILD acovea-5.1.1.ebuild 1177 RMD160 535119f2e29d1eedb84a42f18bcb89e3b5578946 SHA1 69eddf16e67488f07f3861d87de164643de07388 SHA256 6bb0a7d0fa1d0cac4c99fe4fe952fbc888f3fc27f6b9b5d9f37ec65d417d797e
 MISC ChangeLog 2631 RMD160 e607f4f232a80468d73363cf072e71307cdef7dc SHA1 652dd79029e83f2f6f73a716e4784d6c03c7016c SHA256 d795a6b130b05b240126728a0e6e0d8d11a296e2fb01767b05f5084b9d5db613
 MISC metadata.xml 258 RMD160 3c3d1775f27c0635f4e57c85319f4058e3e719b1 SHA1 aaffc49ff87f937b3991a0d692250eca6f393ed6 SHA256 6b80bacd73563c7530978566cf2c81ca5fdb9eef54058a4f75ee0e272043283c
diff --git a/app-benchmarks/acovea/acovea-5.1.1.ebuild b/app-benchmarks/acovea/acovea-5.1.1.ebuild
index 1cdf45e1adbd..6c38340c1cf8 100644
--- a/app-benchmarks/acovea/acovea-5.1.1.ebuild
+++ b/app-benchmarks/acovea/acovea-5.1.1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2010 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.9 2010/09/06 23:22:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/acovea-5.1.1.ebuild,v 1.10 2010/09/06 23:28:23 ssuominen Exp $
 
 EAPI=2
-
 WANT_AUTOMAKE=1.9
-
 inherit autotools eutils
 
 DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm"
@@ -15,7 +13,7 @@ SRC_URI="http://www.coyotegulch.com/distfiles/lib${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
+IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libcoyotl-3.1.0
 	>=dev-libs/libevocosm-3.1.0
@@ -29,13 +27,22 @@ src_prepare() {
 		"${FILESDIR}"/${P}-free-fix.patch \
 		"${FILESDIR}"/${P}-gcc44.patch \
 		"${FILESDIR}"/${P}-glibc-212.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/files/acovea-5.1.1-asneeded.patch b/app-benchmarks/acovea/files/acovea-5.1.1-asneeded.patch
index f3620be7f4b6..8bfb8a175550 100644
--- a/app-benchmarks/acovea/files/acovea-5.1.1-asneeded.patch
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-asneeded.patch
@@ -1,13 +1,13 @@
---- cmdline/Makefile.am.old	2006-06-28 00:48:31.069459287 +0200
-+++ cmdline/Makefile.am	2006-06-28 00:48:40.917331263 +0200
+--- cmdline/Makefile.am
++++ cmdline/Makefile.am
 @@ -7,4 +7,4 @@
  
  runacovea_SOURCES = runacovea.cpp
  
 -LIBS = -L../libacovea -lacovea -lcoyotl -levocosm -lexpat
 +LIBS = -L../libacovea -lacovea -lcoyotl -levocosm
---- libacovea/Makefile.am.old	2006-06-28 00:48:10.959720717 +0200
-+++ libacovea/Makefile.am	2006-06-28 00:48:53.436168516 +0200
+--- libacovea/Makefile.am
++++ libacovea/Makefile.am
 @@ -16,3 +16,5 @@
  library_include_HEADERS = $(h_sources)
  
diff --git a/app-benchmarks/acovea/files/acovea-5.1.1-free-fix.patch b/app-benchmarks/acovea/files/acovea-5.1.1-free-fix.patch
index c64a0af7ac8a..55b3b00e8897 100644
--- a/app-benchmarks/acovea/files/acovea-5.1.1-free-fix.patch
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-free-fix.patch
@@ -1,5 +1,5 @@
---- benchmarks/treebench.c.old	2006-06-28 01:08:11.190117519 +0200
-+++ benchmarks/treebench.c	2006-06-28 01:08:22.124975364 +0200
+--- benchmarks/treebench.c
++++ benchmarks/treebench.c
 @@ -201,8 +201,8 @@
          if (page->m_links[n] != NULL)
              recursive_destroy_page(page->m_links[n]);
diff --git a/app-benchmarks/acovea/files/acovea-5.1.1-gcc44.patch b/app-benchmarks/acovea/files/acovea-5.1.1-gcc44.patch
index ee95724d1070..c5e5392b2f99 100644
--- a/app-benchmarks/acovea/files/acovea-5.1.1-gcc44.patch
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-gcc44.patch
@@ -1,6 +1,5 @@
-diff -NrU5 libacovea-5.1.1.original/libacovea/acovea.cpp libacovea-5.1.1/libacovea/acovea.cpp
---- libacovea-5.1.1.original/libacovea/acovea.cpp	2009-06-07 23:53:01.000000000 -0600
-+++ libacovea-5.1.1/libacovea/acovea.cpp	2009-06-07 23:53:51.000000000 -0600
+--- libacovea/acovea.cpp
++++ libacovea/acovea.cpp
 @@ -44,10 +44,11 @@
  #include <unistd.h>
  #include <sys/types.h>
diff --git a/app-benchmarks/acovea/files/acovea-5.1.1-libevocosm.patch b/app-benchmarks/acovea/files/acovea-5.1.1-libevocosm.patch
index ec30ce644925..f801b8c68bcb 100644
--- a/app-benchmarks/acovea/files/acovea-5.1.1-libevocosm.patch
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-libevocosm.patch
@@ -1,5 +1,5 @@
---- -	2008-05-30 21:03:16.545065718 -0600
-+++ libacovea-5.1.1/libacovea/acovea.cpp	2008-05-30 20:55:48.000000000 -0600
+--- libacovea/acovea.cpp
++++ libacovea/acovea.cpp
 @@ -86,7 +86,7 @@
  // randomize settings of this option
  void option::randomize()