Links against libbrahe (bug #540710).

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 42 insertions, 33 deletions

diff --git a/app-benchmarks/acovea-gtk/ChangeLog b/app-benchmarks/acovea-gtk/ChangeLog
index b878f393d128..442fb63c81dd 100644
--- a/app-benchmarks/acovea-gtk/ChangeLog
+++ b/app-benchmarks/acovea-gtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-benchmarks/acovea-gtk
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea-gtk/ChangeLog,v 1.2 2010/04/25 11:17:32 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea-gtk/ChangeLog,v 1.3 2015/02/20 08:19:21 jer Exp $
+
+  20 Feb 2015; Jeroen Roovers <jer@gentoo.org> acovea-gtk-1.0.1.ebuild,
+  files/acovea-gtk-1.0.1-gcc4.3.patch, +files/acovea-gtk-1.0.1-libbrahe.patch,
+  files/acovea-gtk-1.0.1-libsigc.patch, files/acovea-gtk-1.0.1-unicode.patch:
+  Links against libbrahe (bug #540710).
 
 *acovea-gtk-1.0.1 (23 Apr 2009)
 
diff --git a/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild b/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild
index 752dec873b76..4be4b1479898 100644
--- a/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild
+++ b/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild,v 1.1 2009/04/23 22:06:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild,v 1.2 2015/02/20 08:19:21 jer Exp $
 
-EAPI="2"
+EAPI=5
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm GUI"
 HOMEPAGE="http://www.coyotegulch.com/products/acovea/"
@@ -21,12 +21,14 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	use unicode && epatch "${FILESDIR}"/${P}-unicode.patch
-	epatch "${FILESDIR}"/${P}-{libsigc,gcc4.3}.patch
+	epatch "${FILESDIR}"/${P}-{libbrahe,libsigc,gcc4.3}.patch
+
+	eautorerconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "installation failed"
+	DOCS=( ChangeLog NEWS README )
+	default
 	make_desktop_entry "${PN}" Acovea-gtk \
 		/usr/share/acovea-gtk/pixmaps/acovea_icon_064.png System
-	dodoc ChangeLog NEWS README || die "no docs sorry!"
 }
diff --git a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-gcc4.3.patch b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-gcc4.3.patch
index 66ad7af8b0c5..30bfc96ab3fa 100644
--- a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-gcc4.3.patch
+++ b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-gcc4.3.patch
@@ -1,5 +1,5 @@
---- src/settings_window.cc	2005-10-10 06:48:29.000000000 +0200
-+++ src/settings_window.cc.new	2009-03-18 18:15:12.000000000 +0100
+--- a/src/settings_window.cc
++++ b/src/settings_window.cc
 @@ -6,6 +6,7 @@
  // This file is for your program, I won't touch it again!
  
@@ -9,8 +9,8 @@
  #include "settings_window.hh"
  
 
---- src/main_window.cc	2009-03-18 18:16:03.000000000 +0100
-+++ src/main_window.cc.new	2009-03-18 18:19:08.000000000 +0100
+--- a/src/main_window.cc
++++ b/src/main_window.cc
 @@ -9,6 +9,8 @@
  #include <gtkmm.h>
  #include <gtkmm/main.h>
diff --git a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libbrahe.patch b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libbrahe.patch
new file mode 100644
index 000000000000..4511f23e92f5
--- /dev/null
+++ b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libbrahe.patch
@@ -0,0 +1,8 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -22,4 +22,4 @@
+ AM_CXXFLAGS = @GTKMM_CFLAGS@	
+ 
+ acovea_gtk_LDFLAGS =  -pthread -L//usr/lib
+-acovea_gtk_LDADD = @LIBS@ @GTKMM_LIBS@ -lgthread-2.0 -lglib-2.0 -lcoyotl -levocosm -lacovea -lexpat 
++acovea_gtk_LDADD = @LIBS@ @GTKMM_LIBS@ -lgthread-2.0 -lglib-2.0 -lcoyotl -levocosm -lbrahe -lacovea -lexpat 
diff --git a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libsigc.patch b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libsigc.patch
index 3a89120a3d8c..aa60489ae630 100644
--- a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libsigc.patch
+++ b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libsigc.patch
@@ -1,6 +1,5 @@
-diff -uarN src/about_box_glade.cc src.new/about_box_glade.cc
---- src/about_box_glade.cc	2009-03-18 19:22:34.000000000 +0100
-+++ src.new/about_box_glade.cc	2009-03-18 19:23:08.000000000 +0100
+--- a/src/about_box_glade.cc
++++ b/src/about_box_glade.cc
 @@ -1530,8 +1530,8 @@
     hbuttonbox1->show();
     vbox3->show();
@@ -12,9 +11,8 @@ diff -uarN src/about_box_glade.cc src.new/about_box_glade.cc
  }
  
  about_box_glade::~about_box_glade()
-diff -uarN src/main_window_glade.cc src.new/main_window_glade.cc
---- src/main_window_glade.cc	2009-03-18 19:22:34.000000000 +0100
-+++ src.new/main_window_glade.cc	2009-03-18 19:23:08.000000000 +0100
+--- a/src/main_window_glade.cc
++++ b/src/main_window_glade.cc
 @@ -998,19 +998,19 @@
     main_status->show();
     vbox1->show();
@@ -48,9 +46,8 @@ diff -uarN src/main_window_glade.cc src.new/main_window_glade.cc
  }
  
  main_window_glade::~main_window_glade()
-diff -uarN src/settings_window_glade.cc src.new/settings_window_glade.cc
---- src/settings_window_glade.cc	2009-03-18 19:22:34.000000000 +0100
-+++ src.new/settings_window_glade.cc	2009-03-18 19:23:08.000000000 +0100
+--- a/src/settings_window_glade.cc
++++ b/src/settings_window_glade.cc
 @@ -391,11 +391,11 @@
     hbuttonbox3->show();
     vbox6->show();
@@ -68,9 +65,8 @@ diff -uarN src/settings_window_glade.cc src.new/settings_window_glade.cc
  }
  
  settings_window_glade::~settings_window_glade()
-diff -uarN src/about_box_glade.cc src.new/about_box_glade.cc
---- src/about_box_glade.cc	2009-03-18 18:08:58.000000000 +0100
-+++ src.new/about_box_glade.cc	2009-03-18 18:12:50.000000000 +0100
+--- a/src/about_box_glade.cc
++++ b/src/about_box_glade.cc
 @@ -14,8 +14,7 @@
  #endif //
  #include "config.h"
@@ -80,9 +76,8 @@ diff -uarN src/about_box_glade.cc src.new/about_box_glade.cc
  #define GMM_GTKMM_22_24(a,b) b
  #else //gtkmm 2.2
  #define GMM_GTKMM_22_24(a,b) a
-diff -uarN src/main_window_glade.cc src.new/main_window_glade.cc
---- src/main_window_glade.cc	2009-03-18 18:08:58.000000000 +0100
-+++ src.new/main_window_glade.cc	2009-03-18 18:12:53.000000000 +0100
+--- a/src/main_window_glade.cc
++++ b/src/main_window_glade.cc
 @@ -14,8 +14,7 @@
  #endif //
  #include "config.h"
@@ -92,9 +87,8 @@ diff -uarN src/main_window_glade.cc src.new/main_window_glade.cc
  #define GMM_GTKMM_22_24(a,b) b
  #else //gtkmm 2.2
  #define GMM_GTKMM_22_24(a,b) a
-diff -uarN src/settings_window_glade.cc src.new/settings_window_glade.cc
---- src/settings_window_glade.cc	2009-03-18 18:08:58.000000000 +0100
-+++ src.new/settings_window_glade.cc	2009-03-18 18:12:56.000000000 +0100
+--- a/src/settings_window_glade.cc
++++ b/src/settings_window_glade.cc
 @@ -14,8 +14,7 @@
  #endif //
  #include "config.h"
diff --git a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-unicode.patch b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-unicode.patch
index 7486f3946609..a81d90282f38 100644
--- a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-unicode.patch
+++ b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-unicode.patch
@@ -1,5 +1,5 @@
---- acovea-gtk-1.0.1/src/main_window.cc	2005-10-10 04:48:29.000000000 +0000
-+++ acovea-gtk-1.0.1/src/main_window.cc	2006-03-03 10:23:13.000000000 +0000
+--- a/src/main_window.cc
++++ b/src/main_window.cc
 @@ -488,7 +488,7 @@
  {
      Glib::RefPtr<Gtk::TextBuffer> buffer = main_window_output->get_buffer();