reinit the tree, so we can have metadata

9 files changed, 356 insertions, 0 deletions

diff --git a/dev-util/emilpro/Manifest b/dev-util/emilpro/Manifest
new file mode 100644
index 000000000000..09f70682456f
--- /dev/null
+++ b/dev-util/emilpro/Manifest
@@ -0,0 +1,12 @@
+AUX emilpro-3-system-binutils.patch 1639 SHA256 b2c2a077dea80e5960effe5ecd2247c62ae8aa3353c58e350f1c33def821b739 SHA512 e80467cd91b19c6d4034cf121ff5b812638384e6a6dde6fc8c6dc1a38edb77dbd2ec259fa4e1ef6f8ff8f1a4df9e89bfc4dbaef5fab3ddd7e1020aadac6d3281 WHIRLPOOL 084719fd0cdfd7e5f645a9018cc3828e5dcb3dc261972be0ae79b321d49881b3af83b0087515d43fe8f01dabb210cdfa88ede84bf5e175ae60a7fd65f3976852
+AUX emilpro-9999-system-binutils.patch 1784 SHA256 909c12df4191e155d07e8f49b5ae560a9009078386b416eccd0556bc29529adb SHA512 1edb7f4f534f99cd1b9379040e21ba9fadadc93ecdea67f5da490d3c92d1f7526088451c00959275b6bc9ee02d683f09054d730adcaef2bdb40d77658aa238b7 WHIRLPOOL fcd06c1379af2f38543102a62f1e7e15940be3f4f41608030dcec894bb7b778c029ff681c2b02761e37b916133b348724f241bec2ebf007d685f2fd30153d578
+AUX or1k-2.patch 1299 SHA256 7d623002f5aaaf1d5351beb3702dab0a45f6912c392cd927ffdcb03c6ae6ebce SHA512 d142e5cabf6393b8d8af83391ab3e8fd9514e64a67dd6af8175c605402fdfc136cf79c0fc5a6ecd1c2f4c4dcef7a208c363e4c95ed5545d116160f80aed3e17a WHIRLPOOL ef69ce1e2b579fc0592c9b40fcef1b4158194dfb85ce19e22283a4e406037e8c56a8c5008bcb3dd9c4c1f0b0d5c0230204ad71518372c8ae5c056d0dc2c7f43d
+AUX or1k.patch 4386 SHA256 46348c46df0c4858352c5086a69223c26c47c79a5cbe45ee346eb9e4913940d7 SHA512 7ddc06d15c50095720588899b6fc8889c4184d894fe28c8e6bfca9d9bf4f38a937b4d2722d98c45883c9271e6caac4b838c381c78660233ad8bb91fac1f80bee WHIRLPOOL d378a9bb8a5dbe4b9822fa1e403f6cf5fc17f305b0c7a59d6ef1e8cb03c057d90dbfdf51c168c5f5fe3b6e7f04ddbdb895c1b2b171204ee5ee4946093fc21a0a
+AUX respect-cflags.patch 662 SHA256 a4ffe1d45060bda21a79fe3f3ddf7828b0101415c67a1648381f7cba86896ac3 SHA512 5d308894752de0df6fee2f19ebc3664a0cd980a3e6babed9707db39a342ce3eb2f2c56e7680d0d9d969b3dff9059c2ef1b9cb14ea23af991b3b9e10653a0bda6 WHIRLPOOL 212db413697c7ae0a1dd132fdcd1eba08c726045cd07959fe2e0a52274d4adfe5a093a0b5a937065d4da4a089d39b9c75c70036470ae8d5ca73fc20d28c4d39b
+DIST binutils-2.23.2.tar.bz2 21440347 SHA256 fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097 SHA512 dec753bbba008f1526b89cf1bd85feba78f362f5333ffdf93953fd131eb755976dec82a0a4ba38c43d2434da007137780cfe674de5414be5cf7ce7fbc6af6d16 WHIRLPOOL 1be65f03569d599899c5b57ac7aedbf90b311f9a47c1883dc62c0717b0757ebfb33e17ab3def8d0b805daabba67cf554463f88675c9f552a6fd8dbe7ca77b442
+DIST emilpro-3.tar.gz 120276 SHA256 6c4cf5d7debcc19a87bc61682d3adee4e2d1cdec2a06570f203130d6cf917748 SHA512 18a90dd672a4fb878f0da1eefacb01f159e25b28c94ea6707578deab74dbf07ee0f9d276e376f4eaff7b00c4dd7edcf5b7cbb3e5b316f4d720fe0343e1c36727 WHIRLPOOL d484f6860118db921736001982461ad5410cdf63aca21c9896e9bbe17fdb693f7debd53282fca61d085f405c1d701af99bfcd12b2cc554ddc11607b98977262a
+EBUILD emilpro-3-r3.ebuild 1654 SHA256 361f74e3a75620cc1ade5311d970d141c4e0ac29dd0c9cb04ebfbd6e7d0c6dd9 SHA512 df5a61bfcaa3f3f5d0665522c7d9e3622eb90304bcc03d2879a20f110165f5cc3ebe8ba4690c918d2c4c9fd14d940d8ffae1e8c6670b8516b5ae404b7b991f6f WHIRLPOOL ec21da4ac09df9ad112dfce24b9d11ff05495c05a828e964ef9c8e10443ded8a8edc33e92ae87c0b0d5c74345347652f4bbd69abd9774da642af106b074ae0f0
+EBUILD emilpro-9999.ebuild 1579 SHA256 765d51a9556e6de24d84232b6413c5d4e422a075c8fb37be1ce32ee2dc9547c0 SHA512 dd5005b1322ba00d6b1d323fc73c402109dada2c226eb6353beb88d3ef89d6c141cdb0656afa5ba036a4748de6098062917be14a2f52ea0305bcce3e93fd286c WHIRLPOOL 8969c70bdfb3a8ff30761d6604a15fa4ef7ec56632985e782790615f1337ab7aa5f2b0ac2585cab264ee2c121562b9a1eb4ed4d6ac1cc4417abb7976266f1d9b
+MISC ChangeLog 3408 SHA256 385f4001a00a102fdc5781c53eab580c5404ea18894359a6a634411f750e859a SHA512 d4261936db1c323eb015192b27390496c05ecb1917f544333c9fc99515258befa56442c42d7610a6f00ab3d08539912ebb33411b489c43411af652097b589601 WHIRLPOOL a498fc340b8477fbc3d378879b8f4374edec861ace8b8f774bc8503b62b5dfca6c31297b6be1f66a309d469de9edfb7a5c19cad8b382dc9ee0b986bc228931a6
+MISC ChangeLog-2015 913 SHA256 ddb7b6100379645e8ca06b3aab44cb7eeebec3ac463f257f1a56c7662acf9ad6 SHA512 2d72fdf32e166a0806f208b2a56ca564a7da7610ddba75a838ce8be6167f36e92a7e9016bb2a6539037a76a795788e79c7090b7f621a33a3bdc2e99cbf4d399b WHIRLPOOL f46863b4d6571b61172baff3a79c662ac1315e16177d1629b1d45a4120bf1bf86e4e13cfb57b2c610db61f1326e3733132cd41b3a2e5f1504033c4cd7002b124
+MISC metadata.xml 371 SHA256 96cb6e64ec7e383b3f3834b67f822741d9aeac18d1aa8d06f3d631effda871eb SHA512 133f1a99dcc7b0eaa0ed4c28334fb7ee73010987f5435d9d2ccaa1e5956ff4a9cc4f4b0fcb9f755e44fb5e0453aa9b69684a7435ac6d7d4c27bcb01dbe65117c WHIRLPOOL 38e11f068f1c3c45ebc2e0f441b0ff1b224c7ec126dfdcccfd53989a65536f86a6b02de7f904d0f68a3ff261ca7e0a49ed133a47d918dbb201c3ebce8d4b8571
diff --git a/dev-util/emilpro/emilpro-3-r3.ebuild b/dev-util/emilpro/emilpro-3-r3.ebuild
new file mode 100644
index 000000000000..e40bc9b228ee
--- /dev/null
+++ b/dev-util/emilpro/emilpro-3-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils eutils
+
+DESCRIPTION="a graphical disassembler for a large number of instruction sets"
+HOMEPAGE="http://www.emilpro.com/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/SimonKagstrom/emilpro"
+	inherit git-r3
+	KEYWORDS=""
+	SRC_URI="!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
+else
+	SRC_URI="http://www.emilpro.com/${P}.tar.gz
+		!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+system-binutils"
+
+DEPEND="
+	dev-cpp/gtkmm:3.0
+	dev-cpp/gtksourceviewmm:3.0
+	dev-cpp/libxmlpp:2.6
+	dev-cpp/glibmm
+	dev-cpp/pangomm
+	dev-cpp/cairomm
+	dev-libs/libsigc++:2
+	dev-libs/glib:2
+	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] )
+	net-misc/curl
+	virtual/libelf:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/respect-cflags.patch
+	if use system-binutils; then
+		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
+	epatch "${FILESDIR}"/or1k.patch
+	epatch "${FILESDIR}"/or1k-2.patch
+	cmake-utils_src_prepare
+}
+
+src_compile() {
+	if use system-binutils; then
+		cmake-utils_src_compile
+	else
+		#bundled binutils is broken, always builds with one thread
+		#but somehow it still fails if I don't do this
+		cd "${BUILD_DIR}"
+		emake -j1
+	fi
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/emilpro
+}
diff --git a/dev-util/emilpro/emilpro-9999.ebuild b/dev-util/emilpro/emilpro-9999.ebuild
new file mode 100644
index 000000000000..3cad6fafde7f
--- /dev/null
+++ b/dev-util/emilpro/emilpro-9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils eutils
+
+DESCRIPTION="a graphical disassembler for a large number of instruction sets"
+HOMEPAGE="http://www.emilpro.com/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/SimonKagstrom/emilpro"
+	inherit git-r3
+	KEYWORDS=""
+	SRC_URI="!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
+else
+	SRC_URI="http://www.emilpro.com/${P}.tar.gz
+		!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+system-binutils"
+
+DEPEND="
+	dev-cpp/gtkmm:3.0
+	dev-cpp/gtksourceviewmm:3.0
+	dev-cpp/libxmlpp:2.6
+	dev-cpp/glibmm
+	dev-cpp/pangomm
+	dev-cpp/cairomm
+	dev-libs/libsigc++:2
+	dev-libs/glib:2
+	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] )
+	net-misc/curl
+	virtual/libelf:0="
+# automagic dep
+# dev-util/capstone
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if use system-binutils; then
+		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
+	cmake-utils_src_prepare
+}
+
+src_compile() {
+	if use system-binutils; then
+		cmake-utils_src_compile
+	else
+		#bundled binutils is broken, always builds with one thread
+		#but somehow it still fails if I don't do this
+		cd "${BUILD_DIR}"
+		emake -j1
+	fi
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/emilpro
+}
diff --git a/dev-util/emilpro/files/emilpro-3-system-binutils.patch b/dev-util/emilpro/files/emilpro-3-system-binutils.patch
new file mode 100644
index 000000000000..d73f402a3005
--- /dev/null
+++ b/dev-util/emilpro/files/emilpro-3-system-binutils.patch
@@ -0,0 +1,48 @@
+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})
+ 
+ # Dependencies
+-include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake)
+ 
+ find_package (LibElf REQUIRED)
+ find_package (PkgConfig REQUIRED)
+@@ -30,7 +29,6 @@
+ pkg_check_modules(LIBCURL libcurl)
+ 
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1")
+-LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64)
+ 
+ if (HAVE_BFD_MULTIARCH)
+ 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH")
+@@ -110,7 +108,6 @@
+ 	src/include/
+ 	${CMAKE_BINARY_DIR}
+ 	${LIBELF_INCLUDE_DIRS}
+-	${CMAKE_BINARY_DIR}/install-binutils/include/
+ 	${GTKMM_INCLUDE_DIRS}
+ 	${GTKSOURCEVIEWMM_INCLUDE_DIRS}
+ 	${LIBXMLPP_INCLUDE_DIRS}
+@@ -128,8 +125,6 @@
+ 	tools/squash-instruction-models.cc
+ 	)
+ 
+-set_property(TARGET emilpro APPEND PROPERTY OBJECT_DEPENDS binutils)
+-set_property(TARGET tools/squash-instruction-models APPEND PROPERTY OBJECT_DEPENDS binutils)
+ 
+ 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-system-binutils.patch b/dev-util/emilpro/files/emilpro-9999-system-binutils.patch
new file mode 100644
index 000000000000..194e8d10b6e4
--- /dev/null
+++ b/dev-util/emilpro/files/emilpro-9999-system-binutils.patch
@@ -0,0 +1,52 @@
+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})
+ 
+ # Dependencies
+-include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake)
+ 
+ find_package (LibElf REQUIRED)
+ 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")
+-LINK_DIRECTORIES(
+-	${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64
+-	${CMAKE_BINARY_DIR}/binutils/libiberty
+-	)
+ 
+ if (HAVE_BFD_MULTIARCH)
+ 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH")
+@@ -120,7 +115,6 @@
+ set_property(SOURCE src/emilpro.cc APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/built_in_instruction_models.hh)
+ 
+ include_directories(
+-	${CMAKE_BINARY_DIR}/install-binutils/include/
+ 	src/gtk/include/
+ 	src/include/
+ 	${CMAKE_BINARY_DIR}
+@@ -143,9 +137,6 @@
+ 	tools/squash-instruction-models.cc
+ 	)
+ 
+-set_property(TARGET emilpro APPEND PROPERTY OBJECT_DEPENDS binutils)
+-set_property(TARGET tools/squash-instruction-models APPEND PROPERTY OBJECT_DEPENDS binutils)
+-
+ 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;
+ 
diff --git a/dev-util/emilpro/files/or1k-2.patch b/dev-util/emilpro/files/or1k-2.patch
new file mode 100644
index 000000000000..9dd4e195342a
--- /dev/null
+++ b/dev-util/emilpro/files/or1k-2.patch
@@ -0,0 +1,22 @@
+From 5b41e51bfb9fdeac7c6a2441badf8c3b92463fef Mon Sep 17 00:00:00 2001
+From: Alex Chernetz <andy80586@gmail.com>
+Date: Fri, 1 May 2015 14:34:31 -0700
+Subject: [PATCH] Function is print_insn_or1k, not print_insn_little_or1k
+
+---
+ src/bfd-disassembly.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bfd-disassembly.cc b/src/bfd-disassembly.cc
+index bf3e768..eeecbe4 100644
+--- a/src/bfd-disassembly.cc
++++ b/src/bfd-disassembly.cc
+@@ -38,7 +38,7 @@ class Disassembly : public IDisassembly,
+ 	    m_arch[bfd_arch_m68k] = BfdArch(bfd_arch_m68k, bfd_mach_m68040, print_insn_m68k);      /* Motorola 68xxx */
+ 	    m_arch[bfd_arch_vax] = BfdArch(bfd_arch_vax, 0, print_insn_vax);       /* DEC Vax */
+ 	    m_arch[bfd_arch_i960] = BfdArch(bfd_arch_i960, 0, print_insn_i960);      /* Intel 960 */
+-	    m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_little_or1k);      /* OpenRISC 32 */
++	    m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_or1k);      /* OpenRISC 32 */
+ 	    m_arch[bfd_arch_sparc] = BfdArch(bfd_arch_sparc, 0, print_insn_sparc);     /* SPARC */
+ 	    m_arch[bfd_arch_spu] = BfdArch(bfd_arch_spu, 0, print_insn_spu);       /* PowerPC SPU */
+ 	    m_arch[bfd_arch_i860] = BfdArch(bfd_arch_i860, 0, print_insn_i860);      /* Intel 860 */
diff --git a/dev-util/emilpro/files/or1k.patch b/dev-util/emilpro/files/or1k.patch
new file mode 100644
index 000000000000..e7a4392f0bdb
--- /dev/null
+++ b/dev-util/emilpro/files/or1k.patch
@@ -0,0 +1,70 @@
+From f59c5f424a268313c1fcc009fd1e40c00bf6c4f2 Mon Sep 17 00:00:00 2001
+From: Alex Chernetz <andy80586@gmail.com>
+Date: Fri, 1 May 2015 13:32:27 -0700
+Subject: [PATCH] or32 and openrisc architectures are replaced by or1k in
+ current binutils
+
+---
+ src/architecturefactory.cc | 6 ++----
+ src/bfd-disassembly.cc     | 3 +--
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/src/architecturefactory.cc b/src/architecturefactory.cc
+index 709b770..25ccf80 100644
+--- a/src/architecturefactory.cc
++++ b/src/architecturefactory.cc
+@@ -10,7 +10,7 @@ ArchitectureFactory::ArchitectureFactory() :
+ 	m_architectureNameMap[(unsigned)bfd_arch_m68k] = "m68k";
+ 	m_architectureNameMap[(unsigned)bfd_arch_vax] = "vax";
+ 	m_architectureNameMap[(unsigned)bfd_arch_i960] = "i960";
+-	m_architectureNameMap[(unsigned)bfd_arch_or32] = "or32";
++	m_architectureNameMap[(unsigned)bfd_arch_or1k] = "or1k";
+ 	m_architectureNameMap[(unsigned)bfd_arch_sparc] = "sparc";
+ 	m_architectureNameMap[(unsigned)bfd_arch_mips] = "mips";
+ 	m_architectureNameMap[(unsigned)bfd_arch_i386] = "i386";
+@@ -68,7 +68,6 @@ ArchitectureFactory::ArchitectureFactory() :
+ 	m_architectureNameMap[(unsigned)bfd_arch_cris] = "cris";
+ 	m_architectureNameMap[(unsigned)bfd_arch_s390] = "s390";
+ 	m_architectureNameMap[(unsigned)bfd_arch_score] = "score";
+-	m_architectureNameMap[(unsigned)bfd_arch_openrisc] = "openrisc";
+ 	m_architectureNameMap[(unsigned)bfd_arch_mmix] = "mmix";
+ 	m_architectureNameMap[(unsigned)bfd_arch_xstormy16] =  "xstormy16";
+ 	m_architectureNameMap[(unsigned)bfd_arch_xc16x] = "xc16x";
+@@ -81,7 +80,7 @@ ArchitectureFactory::ArchitectureFactory() :
+ 	m_nameArchitectureMap["m68k"] = (unsigned)bfd_arch_m68k;
+ 	m_nameArchitectureMap["vax"] = (unsigned)bfd_arch_vax;
+ 	m_nameArchitectureMap["i960"] = (unsigned)bfd_arch_i960;
+-	m_nameArchitectureMap["or32"] = (unsigned)bfd_arch_or32;
++	m_nameArchitectureMap["or1k"] = (unsigned)bfd_arch_or1k;
+ 	m_nameArchitectureMap["sparc"] = (unsigned)bfd_arch_sparc;
+ 	m_nameArchitectureMap["mips"] = (unsigned)bfd_arch_mips;
+ 	m_nameArchitectureMap["i386"] = (unsigned)bfd_arch_i386;
+@@ -139,7 +138,6 @@ ArchitectureFactory::ArchitectureFactory() :
+ 	m_nameArchitectureMap["cris"] = (unsigned)bfd_arch_cris;
+ 	m_nameArchitectureMap["s390"] = (unsigned)bfd_arch_s390;
+ 	m_nameArchitectureMap["score"] = (unsigned)bfd_arch_score;
+-	m_nameArchitectureMap["openrisc"] = (unsigned)bfd_arch_openrisc;
+ 	m_nameArchitectureMap["mmix"] = (unsigned)bfd_arch_mmix;
+ 	m_nameArchitectureMap["xstormy16"] =  (unsigned)bfd_arch_xstormy16;
+ 	m_nameArchitectureMap["xc16x"] = (unsigned)bfd_arch_xc16x;
+diff --git a/src/bfd-disassembly.cc b/src/bfd-disassembly.cc
+index 5cda9e2..bf3e768 100644
+--- a/src/bfd-disassembly.cc
++++ b/src/bfd-disassembly.cc
+@@ -38,7 +38,7 @@ class Disassembly : public IDisassembly,
+ 	    m_arch[bfd_arch_m68k] = BfdArch(bfd_arch_m68k, bfd_mach_m68040, print_insn_m68k);      /* Motorola 68xxx */
+ 	    m_arch[bfd_arch_vax] = BfdArch(bfd_arch_vax, 0, print_insn_vax);       /* DEC Vax */
+ 	    m_arch[bfd_arch_i960] = BfdArch(bfd_arch_i960, 0, print_insn_i960);      /* Intel 960 */
+-	    m_arch[bfd_arch_or32] = BfdArch(bfd_arch_or32, 0, print_insn_little_or32);      /* OpenRISC 32 */
++	    m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_little_or1k);      /* OpenRISC 32 */
+ 	    m_arch[bfd_arch_sparc] = BfdArch(bfd_arch_sparc, 0, print_insn_sparc);     /* SPARC */
+ 	    m_arch[bfd_arch_spu] = BfdArch(bfd_arch_spu, 0, print_insn_spu);       /* PowerPC SPU */
+ 	    m_arch[bfd_arch_i860] = BfdArch(bfd_arch_i860, 0, print_insn_i860);      /* Intel 860 */
+@@ -89,7 +89,6 @@ class Disassembly : public IDisassembly,
+ 	    m_arch[bfd_arch_rl78] = BfdArch(bfd_arch_rl78, 0, print_insn_rl78);
+ 	    m_arch[bfd_arch_rx] = BfdArch(bfd_arch_rx, 0, print_insn_rx);        /* Renesas RX.  */
+ 	    m_arch[bfd_arch_s390] = BfdArch(bfd_arch_s390, bfd_mach_s390_64, print_insn_s390);      /* IBM s390 */
+-	    m_arch[bfd_arch_openrisc] = BfdArch(bfd_arch_openrisc, 0, print_insn_openrisc);  /* OpenRISC */
+ 	    m_arch[bfd_arch_mmix] = BfdArch(bfd_arch_mmix, 0, print_insn_mmix);      /* Donald Knuth's educational processor.  */
+ 	    m_arch[bfd_arch_xstormy16] = BfdArch(bfd_arch_xstormy16, 0, print_insn_xstormy16);
+ 	    m_arch[bfd_arch_msp430] = BfdArch(bfd_arch_msp430, 0, print_insn_msp430);    /* Texas Instruments MSP430 architecture.  */
diff --git a/dev-util/emilpro/files/respect-cflags.patch b/dev-util/emilpro/files/respect-cflags.patch
new file mode 100644
index 000000000000..12d5bd52db5d
--- /dev/null
+++ b/dev-util/emilpro/files/respect-cflags.patch
@@ -0,0 +1,12 @@
+diff -Naur emilpro-3/CMakeLists.txt emilpro-3-cflags/CMakeLists.txt
+--- emilpro-3/CMakeLists.txt	2013-12-28 04:22:34.000000000 -0500
++++ emilpro-3-cflags/CMakeLists.txt	2014-03-18 17:59:47.534542384 -0400
+@@ -29,7 +29,7 @@
+ pkg_check_modules(LIBXMLPP libxml++-2.6)
+ pkg_check_modules(LIBCURL libcurl)
+ 
+-set (CMAKE_CXX_FLAGS "-std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1")
+ LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64)
+ 
+ if (HAVE_BFD_MULTIARCH)
diff --git a/dev-util/emilpro/metadata.xml b/dev-util/emilpro/metadata.xml
new file mode 100644
index 000000000000..cccc81ee370e
--- /dev/null
+++ b/dev-util/emilpro/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>zerochaos@gentoo.org</email>
+<name>Rick Farina</name>
+</maintainer>
+<use>
+<flag name="system-binutils">Use the gentoo binutils instead of building against an unpatched vanilla version</flag>
+</use>
+</pkgmetadata>