gentoo resync : 27.01.2018

3 files changed, 10 insertions, 16 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 9974aa8319cd..b7be7464bc4e 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 41b27f041b49..db838c6e3445 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -15,5 +15,5 @@ EBUILD binutils-2.26.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bdd
 EBUILD binutils-2.27-r1.ebuild 293 BLAKE2B 750c39e7ba698916b54eadd97e36fa8b84c9aaa547bcd671deaff719e9d95e66265a12c7845ea7a98de4337263230ac69f0f634c29a6bead78fa13820dca280f SHA512 4137e36156afbfd4ddc6ba08b6fc94e37556375c42f77e21d72d8338e55af094ef28bcbdfcf2c686232b5932208562f38b64db8638d2199ecfc2465518544267
 EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d
 EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
-EBUILD binutils-9999.ebuild 10747 BLAKE2B 4a45c17c7462dc5ff6898df8b4422d12d9c522fbf00dd77f023790d9be9c33d9aed4f171ac1952c993b3d27d14801fec962d024684580ae88d34afc57e09d2f4 SHA512 647674e10ffd4482e9baf0e7cee69db1210b66b9da0bdafabc61e4541bcc7b833de4aa4e78b4aff44747c0926d2ab7a24acd18598fb6573de0d9b1b3053c1b2b
+EBUILD binutils-9999.ebuild 10246 BLAKE2B c5d159a6fe57e25afd0c0bd8a9c95e9a43e3a9b7fd50bbce162deacf90cf5d25d8809d5c1da0a1cc054e3a410ddcac9d6847f3a3fa66d3d8210e78db78f1f570 SHA512 797c978fa7391631c664a3192ab92beeb139c242ef278150b20e4652c709059bc6f120891c7505a3bfffae88523e035476172fc76c143f6dd61ff225def1aeb4
 MISC metadata.xml 447 BLAKE2B 78d0b6e0a34f19d0f90f568fb84fcddbc995eb2c64f9c4feef2545d49322311fc6825b3b208dc03718bd75d550581efbdc9ee26e7f7a6f856902e640f90bf0f5 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 16b853f51c7e..cef3720ff2ca 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -7,8 +7,8 @@ inherit eutils libtool flag-o-matic gnuconfig multilib versionator
 
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="|| ( GPL-3 LGPL-3 )"
-IUSE="cxx multitarget nls static-libs test"
+LICENSE="GPL-3+"
+IUSE="+cxx doc multitarget +nls static-libs test"
 
 # Variables that can be set here:
 # PATCH_VER          - the patchset version
@@ -62,6 +62,7 @@ RDEPEND="
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
+	doc? ( sys-apps/texinfo )
 	test? ( dev-util/dejagnu )
 	nls? ( sys-devel/gettext )
 	sys-devel/flex
@@ -86,12 +87,11 @@ src_unpack() {
 			;;
 	esac
 	mkdir -p "${MY_BUILDDIR}"
-	[[ -d ${WORKDIR}/patch ]] && mkdir "${WORKDIR}"/patch/skip
 }
 
 src_prepare() {
 	if [[ ! -z ${PATCH_VER} ]] ; then
-		elog "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
 		eapply "${WORKDIR}/patch"/*.patch
 	fi
 
@@ -132,7 +132,6 @@ src_prepare() {
 	elibtoolize --portage --no-uclibc
 }
 
-# Intended for ebuilds to override to set their own versioning information.
 toolchain-binutils_bugurl() {
 	printf "https://bugs.gentoo.org/"
 }
@@ -219,6 +218,7 @@ src_configure() {
 		--enable-obsolete
 		--enable-shared
 		--enable-threads
+		--enable-default-hash-style=gnu
 		# Newer versions (>=2.27) offer a configure flag now.
 		--enable-relro
 		# Newer versions (>=2.24) make this an explicit option. #497268
@@ -237,13 +237,8 @@ src_configure() {
 	echo ./configure "${myconf[@]}"
 	"${S}"/configure "${myconf[@]}" || die
 
-	# Prevent makeinfo from running in releases.  It may not always be
-	# installed, and older binutils may fail with newer texinfo.
-	# Besides, we never patch the doc files anyways, so regenerating
-	# in the first place is useless. #193364
-	# For older versions, it means we don't get any info pages at all.
-	# Oh well, tough luck. #294617
-	if [[ -e ${S}/gas/doc/as.info ]] || ! version_is_at_least 2.24 ; then
+	# Prevent makeinfo from running if doc is unset.
+	if ! use doc ; then
 		sed -i \
 			-e '/^MAKEINFO/s:=.*:= true:' \
 			Makefile || die
@@ -254,9 +249,8 @@ src_compile() {
 	cd "${MY_BUILDDIR}"
 	emake all
 
-	# only build info pages if we user wants them, and if
-	# we have makeinfo (may not exist when we bootstrap)
-	if type -p makeinfo > /dev/null ; then
+	# only build info pages if the user wants them
+	if use doc ; then
 		emake info
 	fi