enable building with system binutils, respect cxxflags

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

8 files changed, 155 insertions, 75 deletions

diff --git a/dev-util/emilpro/ChangeLog b/dev-util/emilpro/ChangeLog
index f36a47357932..7a8f5bc8e379 100644
--- a/dev-util/emilpro/ChangeLog
+++ b/dev-util/emilpro/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/emilpro
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/emilpro/ChangeLog,v 1.1 2014/03/18 04:26:05 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/emilpro/ChangeLog,v 1.2 2014/03/19 02:50:34 zerochaos Exp $
+
+*emilpro-3-r1 (19 Mar 2014)
+
+  19 Mar 2014; Rick Farina <zerochaos@gentoo.org> +emilpro-3-r1.ebuild,
+  +files/respect-cflags.patch, +files/use-gentoo-binutils.patch,
+  -emilpro-3.ebuild, emilpro-9999.ebuild, metadata.xml:
+  enable building with system binutils, respect cxxflags
 
 *emilpro-3 (18 Mar 2014)
 *emilpro-9999 (18 Mar 2014)
diff --git a/dev-util/emilpro/Manifest b/dev-util/emilpro/Manifest
index ae5283227921..69d7b9e3d2b5 100644
--- a/dev-util/emilpro/Manifest
+++ b/dev-util/emilpro/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX respect-cflags.patch 662 SHA256 a4ffe1d45060bda21a79fe3f3ddf7828b0101415c67a1648381f7cba86896ac3 SHA512 5d308894752de0df6fee2f19ebc3664a0cd980a3e6babed9707db39a342ce3eb2f2c56e7680d0d9d969b3dff9059c2ef1b9cb14ea23af991b3b9e10653a0bda6 WHIRLPOOL 212db413697c7ae0a1dd132fdcd1eba08c726045cd07959fe2e0a52274d4adfe5a093a0b5a937065d4da4a089d39b9c75c70036470ae8d5ca73fc20d28c4d39b
+AUX use-gentoo-binutils.patch 1285 SHA256 798999c4a75f43ec73226b7947e1376386a46ce805f7d8dafaba5571d8209a85 SHA512 9f3e17b86aadfa2e614680257e1e9f7d0e8db107effc8930048da697d09b5f9bb458e0a1ba450c2879a268018a59e62c61e256cbc5e90c22965228a02a6773bd WHIRLPOOL c15946e968829923867963d192fb2fe7b6a64689dc5e76ea1dbbe8b8c7d87de4c5b61c6aff26c663ff773e005f64b74c8624a1e30608a969b4f5d277c5d2871c
 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.ebuild 1264 SHA256 dc3812ddda2b0aa1e7c2870567ee703f949f02675843f609d44e7945fa9c0059 SHA512 691fe8105a0ac7944ac3d1d21ef870c4b59ad57e394d3b5dc888fdbac8c0808dead5e41fa991c2e352e8d6a33e575f95add77acb4b8a16e20dee4fb35170d1a9 WHIRLPOOL b024883881dcd3b78c81870e58117f40768bff78167960d0fbbb0a4ef2d6f88cada044b89b23e92f1e7fb3dd2d0f5e77e99c133fd579a342bd20202102ba2e8c
-EBUILD emilpro-9999.ebuild 1267 SHA256 a877bb438522a8671637a6ecaa82b931a79b17874f885a193ad545828be35336 SHA512 cb529c94b1d36f45fa1326c8fc904a90a797ee7f12ad9a3c725edf3a7c4c261d0c2bb555ee48b82d82778a5a5646ca4896b8bf96c74185a2bdc302202b481638 WHIRLPOOL 07a0c3d412370efa5e3a9f4850799133ceabf3f7631fa8c67068f50a022768a9849575f2aaffa2edec548d189bcdad8600489bfad8a7e9543963e9ee879fa38e
-MISC ChangeLog 414 SHA256 b004c447c1276d784d1cd675dd9857d44c866f7353b297d48effebfdc7717e88 SHA512 29a24f9b43d4b06b221f8b7fd7fe1594ec188d87be7565f5a5b7dc722ddcba80825373de31fea7041601380f79ef4ee2313f586bab0b1f232bfa326c70c8dc8e WHIRLPOOL e302b22a284013dd69f27ade83ed7ee0d20dedf592f232938d7ca63593e603e90d11bee81fcfe04fe3a4d0b99229033e70dea815a5d82ad5ce942237690647a3
-MISC metadata.xml 274 SHA256 fcdb6e69f3adb718ed543a83635badf4e360a57c550760997c4c5f8ea5c7193a SHA512 8b3d3358fe15d41a5bae960eb75727923c05bab81f63ab6cbab1134e9f49fe69c7e710edf051765950c57a2ef0025207d5f7c129b2bdccfca5be3ec042cf458e WHIRLPOOL 152e28545dc06eb18012d2545644b8bd223c546d10524a7c879573fb1ad265d75ff1ae8e3a95ee6777dbff155ff4ab6795841a884d3dd722579fa8ed5fa6bb49
+EBUILD emilpro-3-r1.ebuild 1585 SHA256 de06bb13f8da1aaef2f1d364a4a68a195134d570916c3260987a6fbaeb4f9adc SHA512 f9b237594d0864571ce9353c4d3e8fb8ec1cbdab0ee056382456163673ed2f4b1e64ec80c3e75658e231ce7da5b7c6c4db8dd6914c5cfafbe277b94e61ccf2e2 WHIRLPOOL 1a77e18821915d9f1198024a04d52bca6f6d2210bd106cb1d90636301ede73f86f4eda9eebc6d6a3107932dd84d36eefbb5ae71df0b24b108b7d72700e5a57fc
+EBUILD emilpro-9999.ebuild 1585 SHA256 12cbea2232c9ec999927a0800f705f25fe480e2dde8c4b112a7475f719f787e2 SHA512 409175a4de949c66df334fabe33ad8f615668a28d22fad6499dfe91c381b3ba67d2db54a358fb2de64585283fb6cca73b47b63115677ec263a2459650d1fc0d5 WHIRLPOOL 0f4ddb64968e2609522671ac77b1e31616067afb0b9afbdd1209798955045157c1c2de914fd85479c62c79e75e490e1296e2edcc542c07bb0c4e3c8b283b25a8
+MISC ChangeLog 694 SHA256 cddfc4261a49e53dfc7ec09ef032ba268008b2dd9eada7bb982be4d8d7924f53 SHA512 55a5c573fc2b1a9543830171c1f4f0a99bd8b9dabe288753659bae5ed4211392c5762dcdf316f8477edcb0cf7f7293fe9d6d16973abae9ffc2a47b3dcf1a04cf WHIRLPOOL 7a60d8896638006cb9eda27e4149384318f728fa526d5fd07fb569ade9645e87385da3a87623df20b8b1d2a460d01167b8cc1578a128764cff1fd27b89c6278f
+MISC metadata.xml 404 SHA256 5af6685d2df63d1ae55ffe0a48ac4bd18ea2e19334ddf2823c4d0340fbfd1313 SHA512 48e0e2496d63b298549c23e6b8d1bcff98e37da7dbb32d354f3844054913208bcc373983a9f0ab3e4d59aee84f7e1890c9a085d21bbf2e68c051d2ab18683d36 WHIRLPOOL 98e4e2b673f181a72a203ddd0c9a2de3d0acfd1fc304fe48fd55ec4bbc1d427b9444b29ae4174056ebaffd11e580ee88d64d2597e4c5dfbf501a309d11c632de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJTJ8tDAAoJEKXdFCfdEflKnwEQAKw5mjKTbgOUGFApUB3jp95Z
-s3XX01KOGHYLxjZ8oPI/e+lhyceA8Ji+Xayd7sRsqlBCJuG/WMb0DJZc3kNqRy68
-6Iiy9eQhtgcBmB2wjRESg+s86FqnFckV6absWpiOGApSkDMzhsPvwyAXCNu3+i4O
-HP+I28yjEyfNiAs8Ac9LfKnDZgwzT4b7MAad+B1ArW+g94DpdTCoMd63+G3w6Fl1
-BvvBH9l9vGZL3fu7kKSwIf3Lm+eY1DPL/AEv+mnAACkrlKaT2D6dU05XMoQy7e4e
-hSVKDbqZc7fpZiY8CKqtqXk2lis1400FHa9T+b/AU/kX8yUD5CNXSVFX9ucNGY/l
-C/gR5wl0TwRFNERu8qAgEdnopqx6wB5oSqAm1Z7mh4JRfruAUNWohwU4H55Uw8zY
-eYjL71Se1TB1vH2iPrlNTKQp0EyymPXemd94/yToce50+qSf9ydsKJxCLVnhSG7v
-Awfh55/gaCanqIOdSDTVcNcQTA2Eb7SyywG3xobF2/ZzbW4Cvcq67CId4X5B7ang
-vg6HtGForhWnNZW9kbPYOpxRkKGAc0g70oqY2t79+ntyv3Oy0QCaAjITc9g10zYu
-ta36CwwUMxxAT2kOY2Ni6qDNzsGN5bcHQrmKwrUIydoUw4FQy7hMNSg/qzYGs+b/
-oK6gJhgQxjTU2pNpoegI
-=l4Yx
+iQIcBAEBCgAGBQJTKQZkAAoJEKXdFCfdEflK4a4QAJGgaC3vDLXm+OeonwoO8t7W
+B/Y+J4f87jMNuq4Ra3rX+ps7vcGz7nMozrsebVOZkgb5vsg1xmouPbEp4zsmpZba
+Y7VqNdiufyXGXwbDT0hKIg2qRskfchQCUAZHeCny3DE4WikLVsOUr+D9mV//EbOR
+QFJfC9LOqG8Eoqjk96b089BR/h6Nf8mVyuUhZrwRB2qLyp2/SrAutpOSi0XGZnGb
+1smUc5kZXEOqNNZPfhv3Y5RCa4RVvHI8jZTgq/ED1Utnhp69I94HxqNPA7OfzVcs
+mruUw/b5/6UfZEtJqqm/KV5DGDj6gZvD3Sij2hvU4nGfnxv4lWGCeDPgPu8rjOAE
+esYwhWmXJ9Qv4HHoMu8/Zs7HGJxbwke/bSoMC1li6q4kcXXL+Jw3YZfVYk6jZGt/
+NE9G449BnqgyIzoAqBjLjvW4sIXq9pZ83OTwJdYqQ4qY/JqTOmerS+144I/DwF9C
+JM4MTJM0y2OdUKGkLkhKgU9a/W+geVzrGKpVu9aSB5Z9y9DTJPrtfeDxYB996Mq9
+WqXTtbOcxaGS/NFrT6DjmEh/jHe0irpZdIoUSZOKX38wTw7MooTUDbkylW6ZEZSs
+e3Il16v82NYQRVuUGrCHWG52KyqhmmauJ+LEd0rvZa4ehz/o2uU4uBbqefLrX7WJ
+l6JyOjg3l/Y8pMz2r2cr
+=oqXR
 -----END PGP SIGNATURE-----
diff --git a/dev-util/emilpro/emilpro-3-r1.ebuild b/dev-util/emilpro/emilpro-3-r1.ebuild
new file mode 100644
index 000000000000..b54262fbdb10
--- /dev/null
+++ b/dev-util/emilpro/emilpro-3-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/emilpro/emilpro-3-r1.ebuild,v 1.1 2014/03/19 02:50:34 zerochaos Exp $
+
+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="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"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+system-binutils"
+
+DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
+	dev-cpp/gtkmm:3.0
+	dev-cpp/gtksourceviewmm:3.0
+	dev-cpp/libxmlpp:2.6
+	system-binutils? ( sys-devel/binutils[multitarget] )
+	net-misc/curl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/respect-cflags.patch
+	if use system-binutils; then
+		epatch "${FILESDIR}"/use-gentoo-binutils.patch
+	else
+		sed -i "s#wget -O binutils.tar.bz2 http://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/emilpro-3.ebuild b/dev-util/emilpro/emilpro-3.ebuild
deleted file mode 100644
index 62d6763e7326..000000000000
--- a/dev-util/emilpro/emilpro-3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/emilpro/emilpro-3.ebuild,v 1.1 2014/03/18 04:26:05 zerochaos Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-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="mirror://gnu/binutils/binutils-2.23.2.tar.bz2"
-else
-	SRC_URI="http://www.emilpro.com/${P}.tar.gz
-		mirror://gnu/binutils/binutils-2.23.2.tar.bz2"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
-	dev-cpp/gtkmm:3.0
-	dev-cpp/gtksourceviewmm:3.0
-	dev-cpp/libxmlpp:2.6
-	net-misc/curl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i "s#wget -O binutils.tar.bz2 http://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
-	cmake-utils_src_prepare
-}
-
-src_compile() {
-	#it builds with one thread no matter what,
-	#but somehow it still fails if I don't do this
-	cd "${BUILD_DIR}"
-	emake -j1
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/emilpro
-}
diff --git a/dev-util/emilpro/emilpro-9999.ebuild b/dev-util/emilpro/emilpro-9999.ebuild
index 7438415c9b87..d9357d23992a 100644
--- a/dev-util/emilpro/emilpro-9999.ebuild
+++ b/dev-util/emilpro/emilpro-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/emilpro/emilpro-9999.ebuild,v 1.1 2014/03/18 04:26:05 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/emilpro/emilpro-9999.ebuild,v 1.2 2014/03/19 02:50:34 zerochaos Exp $
 
 EAPI=5
 
-inherit cmake-utils
+inherit cmake-utils eutils
 
 DESCRIPTION="a graphical disassembler for a large number of instruction sets"
 HOMEPAGE="http://www.emilpro.com/"
@@ -16,31 +16,41 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI="mirror://gnu/binutils/binutils-2.23.2.tar.bz2"
 else
 	SRC_URI="http://www.emilpro.com/${P}.tar.gz
-		mirror://gnu/binutils/binutils-2.23.2.tar.bz2"
+		!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
 	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="+system-binutils"
 
 DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
 	dev-cpp/gtkmm:3.0
 	dev-cpp/gtksourceviewmm:3.0
 	dev-cpp/libxmlpp:2.6
+	system-binutils? ( sys-devel/binutils[multitarget] )
 	net-misc/curl"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	sed -i "s#wget -O binutils.tar.bz2 http://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
+	epatch "${FILESDIR}"/respect-cflags.patch
+	if use system-binutils; then
+		epatch "${FILESDIR}"/use-gentoo-binutils.patch
+	else
+		sed -i "s#wget -O binutils.tar.bz2 http://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() {
-	#it builds with one thread no matter what,
-	#but somehow it still fails if I don't do this
-	cd "${BUILD_DIR}"
-	emake -j1
+	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() {
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/files/use-gentoo-binutils.patch b/dev-util/emilpro/files/use-gentoo-binutils.patch
new file mode 100644
index 000000000000..576055810710
--- /dev/null
+++ b/dev-util/emilpro/files/use-gentoo-binutils.patch
@@ -0,0 +1,36 @@
+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
+@@ -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 --git a/dev-util/emilpro/metadata.xml b/dev-util/emilpro/metadata.xml
index 4b6b68191d89..6151b9b64083 100644
--- a/dev-util/emilpro/metadata.xml
+++ b/dev-util/emilpro/metadata.xml
@@ -7,4 +7,7 @@
 </maintainer>
 <longdescription lang="en">
 </longdescription>
+<use>
+<flag name="system-binutils">Use the gentoo binutils instead of building against an unpatched vanilla version</flag>
+</use>
 </pkgmetadata>