dev-util/emilpro: fix bug #561978

Package-Manager: portage-2.2.28

4 files changed, 38 insertions, 13 deletions

diff --git a/dev-util/emilpro/emilpro-3-r3.ebuild b/dev-util/emilpro/emilpro-3-r3.ebuild
index 7447e4dd5e68..b6c73d1378bf 100644
--- a/dev-util/emilpro/emilpro-3-r3.ebuild
+++ b/dev-util/emilpro/emilpro-3-r3.ebuild
@@ -33,14 +33,14 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
 	dev-cpp/cairomm
 	dev-libs/libsigc++:2
 	dev-libs/glib:2
-	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r1:=[multitarget] )
+	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] )
 	net-misc/curl"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/respect-cflags.patch
 	if use system-binutils; then
-		epatch "${FILESDIR}"/use-gentoo-binutils.patch
+		epatch "${FILESDIR}"/${P}-system-binutils.patch
 	else
 		sed -i "s#wget -O binutils.tar.bz2 https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
 	fi
diff --git a/dev-util/emilpro/emilpro-9999.ebuild b/dev-util/emilpro/emilpro-9999.ebuild
index dd7ff405c34c..ccf564bcaf95 100644
--- a/dev-util/emilpro/emilpro-9999.ebuild
+++ b/dev-util/emilpro/emilpro-9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
 	dev-cpp/cairomm
 	dev-libs/libsigc++:2
 	dev-libs/glib:2
-	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r1:=[multitarget] )
+	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] )
 	net-misc/curl"
 # automagic dep
 # dev-util/capstone
@@ -41,7 +41,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	if use system-binutils; then
-		epatch "${FILESDIR}"/${P}-use-gentoo-binutils.patch
+		epatch "${FILESDIR}"/${P}-system-binutils.patch
 	else
 		sed -i "s#wget -O binutils.tar.bz2 https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
 	fi
diff --git a/dev-util/emilpro/files/use-gentoo-binutils.patch b/dev-util/emilpro/files/emilpro-3-system-binutils.patch
index 576055810710..d73f402a3005 100644
--- a/dev-util/emilpro/files/use-gentoo-binutils.patch
+++ b/dev-util/emilpro/files/emilpro-3-system-binutils.patch
@@ -1,6 +1,6 @@
-diff -Naur emilpro-3/CMakeLists.txt emilpro-3-nobinutils/CMakeLists.txt
---- emilpro-3/CMakeLists.txt	2013-12-28 04:22:34.000000000 -0500
-+++ emilpro-3-nobinutils/CMakeLists.txt	2014-03-18 14:59:17.983479920 -0400
+diff -Naur emilpro-3-orig/CMakeLists.txt emilpro-3/CMakeLists.txt
+--- emilpro-3-orig/CMakeLists.txt	2016-03-29 13:19:47.035441401 -0400
++++ emilpro-3/CMakeLists.txt	2016-03-29 13:18:36.650443067 -0400
 @@ -11,7 +11,6 @@
  set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
  
@@ -34,3 +34,15 @@ diff -Naur emilpro-3/CMakeLists.txt emilpro-3-nobinutils/CMakeLists.txt
  
  set (BASE_LIBS
  	${LIBELF_LIBRARIES}
+diff -Naur emilpro-3-orig/src/namemangler.cc emilpro-3/src/namemangler.cc
+--- emilpro-3-orig/src/namemangler.cc	2016-03-29 13:17:23.957444786 -0400
++++ emilpro-3/src/namemangler.cc	2016-03-29 13:18:57.306442578 -0400
+@@ -1,7 +1,7 @@
+ #include <namemangler.hh>
+ 
+ #include <bfd.h>
+-#include <demangle.h>
++#include <libiberty/demangle.h>
+ 
+ using namespace emilpro;
+ 
diff --git a/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch b/dev-util/emilpro/files/emilpro-9999-system-binutils.patch
index 8cfa9f52b079..194e8d10b6e4 100644
--- a/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch
+++ b/dev-util/emilpro/files/emilpro-9999-system-binutils.patch
@@ -1,5 +1,6 @@
---- CMakeLists.txt.orig	2015-06-25 22:02:55.041406946 +0200
-+++ CMakeLists.txt	2015-06-25 22:03:51.841696845 +0200
+diff -Naur emilpro-9999-orig/CMakeLists.txt emilpro-9999/CMakeLists.txt
+--- emilpro-9999-orig/CMakeLists.txt	2016-03-29 14:30:48.017340585 -0400
++++ emilpro-9999/CMakeLists.txt	2016-03-29 14:31:21.335339797 -0400
 @@ -11,7 +11,6 @@
  set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
  
@@ -7,8 +8,8 @@
 -include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake)
  
  find_package (LibElf REQUIRED)
- find_package (PkgConfig REQUIRED)
-@@ -30,10 +29,6 @@
+ find_package (LibCapstone)
+@@ -40,10 +39,6 @@
  pkg_check_modules(LIBCURL REQUIRED libcurl)
  
  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1 -pthread")
@@ -19,7 +20,7 @@
  
  if (HAVE_BFD_MULTIARCH)
  	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH")
-@@ -109,7 +104,6 @@
+@@ -120,7 +115,6 @@
  set_property(SOURCE src/emilpro.cc APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/built_in_instruction_models.hh)
  
  include_directories(
@@ -27,7 +28,7 @@
  	src/gtk/include/
  	src/include/
  	${CMAKE_BINARY_DIR}
-@@ -131,9 +125,6 @@
+@@ -143,9 +137,6 @@
  	tools/squash-instruction-models.cc
  	)
  
@@ -37,3 +38,15 @@
  set (BASE_LIBS
  	${LIBELF_LIBRARIES}
  	opcodes
+diff -Naur emilpro-9999-orig/src/namemangler.cc emilpro-9999/src/namemangler.cc
+--- emilpro-9999-orig/src/namemangler.cc	2016-03-29 14:30:48.017340585 -0400
++++ emilpro-9999/src/namemangler.cc	2016-03-29 14:31:06.397340150 -0400
+@@ -1,7 +1,7 @@
+ #include <namemangler.hh>
+ 
+ #include <bfd.h>
+-#include <demangle.h>
++#include <libiberty/demangle.h>
+ 
+ using namespace emilpro;
+