From e59ac9344685b52684c1a7bdc206345f25c06b2a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 13 Jul 2015 07:54:31 +0000 Subject: Sync src_install steps between live/release ebuilds. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200) --- dev-embedded/sdcc/ChangeLog | 6 +++++- dev-embedded/sdcc/sdcc-3.5.0.ebuild | 8 +++----- dev-embedded/sdcc/sdcc-9999.ebuild | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-embedded/sdcc/ChangeLog b/dev-embedded/sdcc/ChangeLog index 306145e83a75..129143bc9b5d 100644 --- a/dev-embedded/sdcc/ChangeLog +++ b/dev-embedded/sdcc/ChangeLog @@ -1,6 +1,10 @@ # 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.53 2015/07/13 07:52:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.54 2015/07/13 07:54:31 vapier Exp $ + + 13 Jul 2015; Mike Frysinger sdcc-3.5.0.ebuild, + sdcc-9999.ebuild: + Sync src_install steps between live/release ebuilds. 13 Jul 2015; Mike Frysinger sdcc-3.5.0.ebuild: Restore USE=doc support #553754 by Tiger. diff --git a/dev-embedded/sdcc/sdcc-3.5.0.ebuild b/dev-embedded/sdcc/sdcc-3.5.0.ebuild index 143098b703fe..f19aa98c01ba 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.5 2015/07/13 07:52:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v 1.6 2015/07/13 07:54:31 vapier Exp $ EAPI="5" @@ -94,10 +94,8 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install - - dodoc doc/README.txt - + default + dodoc doc/*.txt find "${D}" -name .deps -exec rm -rf {} + || die if use doc ; then diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild index d7ab07300352..d77878c7ffad 100644 --- a/dev-embedded/sdcc/sdcc-9999.ebuild +++ b/dev-embedded/sdcc/sdcc-9999.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-9999.ebuild,v 1.4 2015/07/13 07:37:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-9999.ebuild,v 1.5 2015/07/13 07:54:31 vapier Exp $ EAPI="5" @@ -70,7 +70,7 @@ src_configure() { src_install() { default dodoc doc/*.txt - find "${D}" -name .deps -exec rm -rf {} + + find "${D}" -name .deps -exec rm -rf {} + || die if use doc ; then docs_compile || cd "${WORKDIR}"/doc -- cgit v1.2.3-65-gdbad