Restore USE=doc support #553754 by Tiger.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 40 insertions, 20 deletions

diff --git a/dev-embedded/sdcc/ChangeLog b/dev-embedded/sdcc/ChangeLog
index 8526b9b923b1..306145e83a75 100644
--- a/dev-embedded/sdcc/ChangeLog
+++ b/dev-embedded/sdcc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-embedded/sdcc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.52 2015/07/13 07:46:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.53 2015/07/13 07:52:56 vapier Exp $
+
+  13 Jul 2015; Mike Frysinger <vapier@gentoo.org> sdcc-3.5.0.ebuild:
+  Restore USE=doc support #553754 by Tiger.
 
   13 Jul 2015; Mike Frysinger <vapier@gentoo.org> sdcc-3.5.0.ebuild:
   Restore combined live/non-live ebuild logic #553754 by Tiger.
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 9d8676caa0d0..e32990a5e292 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -12,6 +12,7 @@ DIST sdcc-doc-2.7.0.tar.bz2 1211113 SHA256 3a70654c9c0a0f86d9632d85f94eed946c9fa
 DIST sdcc-doc-2.8.0.tar.bz2 1363271 SHA256 b40fd15e69d89872c2982fe8a9ed2cc0415d05d0e830b4969714e0af8db21f6d SHA512 201fcb0ffb96649507dcb0489789e7a89cb30705e9eae3f40b6ce907df3464439488d1369f7d5557873e28bcd44a2af82bb3dab2f02adbf0d6ea88a711bb5d9b WHIRLPOOL cd1bd3f46b931e59423100a88fa1827b35c0c1d746be28c1b17d0d4d57f1af57de215c7f0c4dfa9e7d1d072c1a63ba5ab53a2157a925b0450ef9610d01f732aa
 DIST sdcc-doc-2.9.0.tar.bz2 1388379 SHA256 b3a210dfeb46b924cf36531a6e5a11b9d7334765a61e46688ad3f7016802d057 SHA512 c0214437dada2d2acc3590d8a82b077cd841a93da7fe76cc259adea0da67e6ea0ced14dc80c5ce05261aa5d7e2f345f8cf994dafa4e38bd404b00fd6b5b2d168 WHIRLPOOL dc6957192735f5cca92c7c25c0431c93da3b52c5084a7affd62f43a30a8b0dacb522ce5ee99e823fd4a9f3ffad1d3d93e52f37a906de6cbbd8a030899a009b62
 DIST sdcc-doc-20060502.tar.gz 1027650 SHA256 b2663f2a9a195d94990fe6a958b7f1b1b96f5f11e12a7b738613ca762f927407 SHA512 aba51493c76a019fb439fa8ff2f645bc519bdb9ded30a2871d51f2dd6eedc7315f826e28d5efed0eae731060c22b82071025cec5ae4407c5f6acdd2c18292ff2 WHIRLPOOL e1bff5315e4a6f7902beeca6db641594bbf478d0d9f74e658b3569596d912941c8e62522122b4f34a6fa8b83d4a8402adfad61cce1602bff5c35c16cdd19d124
+DIST sdcc-doc-3.5.0.tar.bz2 1000775 SHA256 97c46765d42c710351a131c03cf32be2dd3841ce2941ea0c7f01fc960c8f3df3 SHA512 43de0c19ad538b4495218b04e5ab6a886fd9945c8a82c400e9a53314547f5d6ab0529989274faecc2d954f35f8fe60f338f09f93536b62a305203d2119df597e WHIRLPOOL 68e34cb5f84b66d2582e393bdd53382164b82ce0fb610ddbe17298c7b81dd0c0b45d1be06684a9aef4debbf036bf344b49a2d991e8a36e43f7e37ec57b5586e8
 DIST sdcc-src-2.6.0.tar.gz 4229518 SHA256 6534450fef981502d5e540464fe0d4332e0f47704548354b59af90eaf290cf93 SHA512 d5802ad7804c771c25b72b5038cdc291d3e67a618fde6a9d03235954a6a133e0ecc42f26eabcc933806e54457e44efea81dc79ac03cb547556da41dec3eff1e6 WHIRLPOOL db33972831052720d75544976bdd2e9eb4c6eeef692c428ee5d82acc016bdf8a6d1d45bc27b9056ca6da604adfd5d79fdaca0769076099d36f048eff86ce52cc
 DIST sdcc-src-2.7.0.tar.bz2 3405687 SHA256 315caf8b239dfe4f922f090f33d24e822eb49a1b443d4be020056c91277ffd95 SHA512 95625aadf386f0da65f4ddb856fd7da8a333ed884e308993a0897a205561438b60d2836a60e33a849f6b6ab5dd938b822072641866596897f48fa62a4c536dd3 WHIRLPOOL f2dea2053d0ed37d6326982bd87b157344caeadfdf92774f927bffb87dff0cf126aeb108ddd5c14b31275313affabf523f6de2762559d5121f3d8c89b809ddd2
 DIST sdcc-src-2.8.0.tar.bz2 3460693 SHA256 cbb035699d8910c7ca2fa360a773504b44165e98042ed8c208fea2fe47a96557 SHA512 91f43ea275f4c27e5c475a9dbfe5e9c7d5804a530151420473cbc65a48ca15c65a6e38628e0bf927d89cd8ddb6b6030d5d65aa9cba7963e23ac18bde42951fd5 WHIRLPOOL b5fc8de30117b0b35df40c7bd9ac6392fcb6fec20ffae5444b3c4005120c5d4607df2c73a8470600f21820ced3f83ce856167c757e5f9d3c6ea4b91abb86caf7
@@ -23,24 +24,24 @@ EBUILD sdcc-2.6.0.ebuild 1575 SHA256 f25810c3129b36ff265da9e857e27d49a542a9fa5e0
 EBUILD sdcc-2.7.0.ebuild 1577 SHA256 b5bd996bd02e31e297e366a000babd5f56ba8fd3ee046d721f6af3fc0ec114de SHA512 6f33044f78499df541374ec8ef3ad2a80d61bf302c84e5d02cdab5d868d09be7027ea5e89b7b5c79aff9dfb00cd3cc547093fd7a82c877e2f457ae16c4fcdff0 WHIRLPOOL 0eae202fa9e91c128b373440442b3696c0475910e63b0f4e3e6fb6c6475aab041ba0aab33f2df9b63b504cdf64a67c7d7488a2a656594319363d0d0a74893c4a
 EBUILD sdcc-2.8.0.ebuild 2087 SHA256 400e3c7ec3b0325549033435b8d320a1677e118f7fc92c0e458bf2f63057788e SHA512 eb999c838d372eee0e9d62a9a48b9f6caf133aa2aa4c8a5aca5e8f229b4e50d80a1c77a8328e700b4f980321b24a90a690b0e991d5c5d5fc33e2cb1de3f2aa4f WHIRLPOOL e9fd0b3121ac1fde0769edae008e4beab2e45d805fe330e4458d323fe5f39edf499b6cc3037b3270e0072576d4e7e06ddb3b348c5b4efe1cb621498048040f72
 EBUILD sdcc-2.9.0.ebuild 2396 SHA256 326504d5b4f77aa03bdd100a811f6fdc0c9fc054b2794c09367a33a19f7b2c4a SHA512 ad39aa59b2138db840c5f83c3d4c5dba593ee36b1fb477082b5e3e2e1b7f1bc3648c859166b2cd76c110ab46e8967247ea48a108aa6ef70d5ae07366ecd69ef6 WHIRLPOOL ae49d98ec4de563aa48620bd61941d10faf4a60b140a6f5717d5955b80ce974284ed5734b3aa0e253dcff84181905446c070792fab26548ee1cc0cc4bf875dce
-EBUILD sdcc-3.5.0.ebuild 2746 SHA256 defbd8fb0f0b5fd87c4191b4953c732b31c93856a8bdf91e7afcdabb4bc1685b SHA512 0fc35fa64baa8d447eae5c5670546f58b89948412ffd5baf1c07ce4f28e51b9b498d133e0935fa11f3cb160fdeb41a9a966b2d139995a964c6f2c44d98834374 WHIRLPOOL e2e73bb1c5b27d9f3ba9bb6566cac09356713792896bd9c2ccdaf429f1eb365a500eed8af8b268011228b77bfa81045c4da1f821d21ae6e1d58b33bf077e79cc
+EBUILD sdcc-3.5.0.ebuild 3106 SHA256 ab2856ab9dbd2be3747d8ef545ac750bb40554112dc0fc17925421dd0cb87dea SHA512 c69bf1bd43231e348cb804bd2fd97437319ef4cdb08933289d8eff7ab531fe4b6f15bcc867d338bbcc789c245645fed024c8378c2ae1a2e644caa50f9a3e70ed WHIRLPOOL 889de2b5b2492c18b0124a9be3fc017bc5322b102e6880f70f4fcedf3d0e74493e48e1ae5044a9057ff8a6d3a5eef6de63cc8a57ef14428fd50277dfbc040764
 EBUILD sdcc-9999.ebuild 2099 SHA256 d038bbdb9ecac81c9c3c8a9d419054837a8e8e8698c032e08ea5aaa141ec02ed SHA512 624e0061af48f64e44f755119c8171ea584941e1dcb35e019fed98ef534512944f39b150a2644fa8f521190a1041c1d9f7fbcaf0c90d8bf393273f7ee13e7cd3 WHIRLPOOL 6743e3168c5f5796e8382799f414d954fd2681980cb10ad3fb2c5b8b4d06a03db5b5f1fd58b58141abab3b186d73ea693e46cd0f69f8d2f8b73d544894bc2db1
-MISC ChangeLog 8392 SHA256 c47be3145e1f80d19c608be426f07460a10573e3a26f0827391eb243f27442d2 SHA512 634b43054ee293977a80bdbad123bd4ca7dc8fc5400b10fa061819452a2a7257c072ab0e135654c9aba714f831a9599e2e8feb6485c7c644a4ee4c9a05e78202 WHIRLPOOL ed3c0919cc64b823b368b628b8d4fa01d5f8d2017bb2dcc5f82844133ba842c938aa1d66b7090fc90f316be06951c25d9849fb089d3f50a06735e2657c9b6f28
+MISC ChangeLog 8506 SHA256 f7f77d1b50ba5d860ee22f38f1693ce01614c71e056a51d24dc9f5ea8b303d38 SHA512 653eaad87aa8071490967c24dc7c43b6beab69aff05b41a20a7117e8f8bcfd0a31a169fd1d6116898ba8607bfe9545c963e602f2888d20bf77e7818e2a3c9ede WHIRLPOOL 849ea2713da057b704ca88a4636ff9d33fc0edbd058f6ef603bd9f5a06a3695f5b4d3d3fd1fada6b4eab9dcadf83e870ea0806dd3113e42c28afe975f0d5dc6c
 MISC metadata.xml 2127 SHA256 feb21b4a44a0d8a54618276763cbfcb418067ae5102f0b8d2575731aff986bde SHA512 71c4eb72abe7a582ce785df9e542e2c83ac1fa9e45a20d0258cea3d625552291032adf0d84287e6f570b3e6f04f6e632d3481665711a603b9a14ae3368ac27e2 WHIRLPOOL a3b74adab58f7c935611033b27d9a2544270219f9ee5592ed4dfd9630c322e6f42369f6d29e413563246d63e0d55f8b069a4092daa00a7061825e1574791ea43
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVo2zyAAoJEPGu1DbS6WIAvYYP/jE7kWWlMv8qbJLIKLYBL9Eh
-SnqCCiZIgk52+2NJSlwJVxUSQHHz9O/83YpI240nlGM3My0e7iE3qZ+d68sFNIk8
-lz/Itqixd8YNgoEEVH+/jfEJdXps3eHR4C8kUfZ3DQX6rBVMaWM5KRGDNYtqEN4s
-CEYWQCOdmALs1p5p0gJM1A4gWYZzSU3wD301dBo4WUF0rDfLQioT4oerPt2Ecn9L
-aQ3HsIUgpBxkYFKZAhyPtYmfEMgTFmjzy0O64RVBbkGgCe9Vu24dnZPgx3qMJuW+
-E+YJdI3d+YiGiwmLwS5VTU/bxeJHSHs4tAyj034YaX8lvwtB2dblXxDBkd/dB2lL
-Q4z+5aDp+SfBxLigbXnKHWyDCFbA26Ho8EfOE4IB+JBVypsilQUv+p7sYsLhakpM
-otK0PPgYwPs2VdLMojfBHRZUZhqpujCG4ZbF+2M0tHISL82yJozu+NjE23NRuZo5
-jpKfQD5Z8yAtMTSTmQlNUCCxQndJdzPyjV3V9WpVjdUYhMYLc1QixyIGlBPR/j6H
-dPZiUjCJL/doHuqwBWr/uyGgUnlqfp4rchxh6/ebo7Fxbfyupyh0aYrlXgi1E0X4
-qZzQYOAAZxFKnDKznSNm9RBNbsjAi9xkt5BXVu2x7LujbGkq3dtCz8geaOF/YjWd
-JUZxrtAc0UVbz2HJA0aX
-=TaZB
+iQIcBAEBCAAGBQJVo25ZAAoJEPGu1DbS6WIAGWgP/RitelVNagROzzTwRlugUIke
+H04rdyO4q3noPdSJBqgqt4VcwDmt16+65CgoNRQYaQDt5owtOdO3VFcns7nmqR2h
+A84pHLBDH5y7rW5x+sw/H/z2i9+9b4roZ7u8b5eWUaTtXzd+5+ueUB0LZPblkmyD
+9H21nRkdooO25Q93+gUImN4Gnlbzs//to+HrccprpDlsjBuDwRjQD3TMsb2emXc9
+SKjI/KLuXpcxbOpK7A9CeuiUiR5moy55L4TmPzkn5gaoN8+fSrl7nneKoGeUvNEm
+//GSE5XlhQ6xDv1DxPDuvD4xKvHgQCVwBgjU4r33foDehTu213erGQof5OTb8tZX
+tfVguCybOpDR0CCqv5vOzawJvgzhVhIJquERVdOlAtemYJUujKSvCwuVWlJdH4tK
+XPAs2B2tlwmqazuxjvKBpSAaYRWRyVC9U8VhjRouypnOKJdeD4KZxhouzS4fM9Bt
+Tl3rOfbPtL8gVtAS2yRfnRuRHhLjtiM5hc6RnXNfhb2KA69NhEgk9r517kecd3sI
+JAILGh5V09v+GBObbsDKN3eLKeNwjxqNal8m3h7rYmE5qipKkNk5DEfzCcT9Lsc5
+9hm/LcVBLqgYfdUUzOsNb0vN1Y1dUhCdnb0y5QcQct3O9q1gdD7ru+idKpYkGAyf
+L+Q//ILT0MDy3UrqrCYa
+=CsNy
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/sdcc/sdcc-3.5.0.ebuild b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
index f15248eeb820..143098b703fe 100644
--- a/dev-embedded/sdcc/sdcc-3.5.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v 1.4 2015/07/13 07:46:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v 1.5 2015/07/13 07:52:56 vapier Exp $
 
 EAPI="5"
 
@@ -9,9 +9,12 @@ inherit eutils
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc"
 	inherit subversion
+	docs_compile() { return 0; }
 else
-	SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2"
+	SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
+		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
 	KEYWORDS="~amd64 ~ppc ~x86"
+	docs_compile() { return 1; }
 fi
 
 DESCRIPTION="Small device C compiler (for various microprocessors)"
@@ -22,7 +25,7 @@ LICENSE="GPL-2 ZLIB
 	packihx? ( public-domain )"
 SLOT="0"
 IUSE="mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
-ucsim device-lib packihx +sdcpp sdcdb sdbinutils non-free +boehm-gc"
+ucsim device-lib packihx +sdcpp sdcdb sdbinutils non-free +boehm-gc doc"
 
 REQUIRED_USE="
 	mcs51? ( sdbinutils )
@@ -42,6 +45,13 @@ RDEPEND="dev-libs/boost:=
 	dev-embedded/gputils
 	boehm-gc? ( dev-libs/boehm-gc:= )"
 DEPEND="${RDEPEND}"
+if docs_compile ; then
+	DEPEND+="
+		doc? (
+			>=app-office/lyx-1.3.4
+			dev-tex/latex2html
+		)"
+fi
 
 src_prepare() {
 	# Fix conflicting variable names between Gentoo and sdcc
@@ -79,7 +89,8 @@ src_configure() {
 		$(use_enable sdcdb sdcdb) \
 		$(use_enable sdbinutils sdbinutils) \
 		$(use_enable non-free non-free) \
-		$(use_enable boehm-gc libgc)
+		$(use_enable boehm-gc libgc) \
+		$(docs_compile && use_enable doc || echo --disable-doc)
 }
 
 src_install() {
@@ -89,6 +100,11 @@ src_install() {
 
 	find "${D}" -name .deps -exec rm -rf {} + || die
 
+	if use doc ; then
+		docs_compile || cd "${WORKDIR}"/doc
+		dohtml -r *
+	fi
+
 	# See /usr/lib/portage/python${version}/install-qa-check.d/10executable-issues
 	# Installed libs are not for our CHOST but for microcontrollers
 	# This disable QA_EXECSTACK, QA_WX_LOAD and scanelf -qyRAF '%e %p'