vapier 15/07/13 07:52:56 Modified: sdcc-3.5.0.ebuild ChangeLog Log: Restore USE=doc support #553754 by Tiger. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.5 dev-embedded/sdcc/sdcc-3.5.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild?r1=1.4&r2=1.5 Index: sdcc-3.5.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sdcc-3.5.0.ebuild 13 Jul 2015 07:46:57 -0000 1.4 +++ sdcc-3.5.0.ebuild 13 Jul 2015 07:52:56 -0000 1.5 @@ -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 @@ 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 @@ 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 @@ 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 @@ $(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 @@ 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' 1.53 dev-embedded/sdcc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/ChangeLog?rev=1.53&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/ChangeLog?rev=1.53&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/ChangeLog?r1=1.52&r2=1.53 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- ChangeLog 13 Jul 2015 07:46:57 -0000 1.52 +++ ChangeLog 13 Jul 2015 07:52:56 -0000 1.53 @@ -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 <[email protected]> sdcc-3.5.0.ebuild: + Restore USE=doc support #553754 by Tiger. 13 Jul 2015; Mike Frysinger <[email protected]> sdcc-3.5.0.ebuild: Restore combined live/non-live ebuild logic #553754 by Tiger.
