From 3e614d133b32a9f285f17c4c4f8c9559150527f6 Mon Sep 17 00:00:00 2001 From: George Shapovalov Date: Sun, 20 Jan 2008 21:53:16 +0000 Subject: fixed conditional dependency on unzip (needed unconditionally, as docs are zipped and listed in SRC_URI, #206033) (Portage version: 2.1.4) --- dev-ada/booch_components/ChangeLog | 9 ++++++-- .../booch_components-20051222-r1.ebuild | 22 +++++++++---------- .../booch_components-20070420.ebuild | 25 +++++++++++----------- 3 files changed, 30 insertions(+), 26 deletions(-) (limited to 'dev-ada') diff --git a/dev-ada/booch_components/ChangeLog b/dev-ada/booch_components/ChangeLog index a7719bb7565b..404374a7541e 100644 --- a/dev-ada/booch_components/ChangeLog +++ b/dev-ada/booch_components/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-ada/booch_components -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ada/booch_components/ChangeLog,v 1.15 2007/05/31 14:47:41 george Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ada/booch_components/ChangeLog,v 1.16 2008/01/20 21:53:16 george Exp $ + + 20 Jan 2008; George Shapovalov + booch_components-20051222-r1.ebuild, booch_components-20070420.ebuild: + fixed conditional dependency on unzip (needed unconditionally, as docs are + zipped and listed in SRC_URI, #206033) *booch_components-20070420 (31 May 2007) diff --git a/dev-ada/booch_components/booch_components-20051222-r1.ebuild b/dev-ada/booch_components/booch_components-20051222-r1.ebuild index aa443b69e01f..37e06a0c9aff 100644 --- a/dev-ada/booch_components/booch_components-20051222-r1.ebuild +++ b/dev-ada/booch_components/booch_components-20051222-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ada/booch_components/booch_components-20051222-r1.ebuild,v 1.5 2007/06/26 01:44:52 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ada/booch_components/booch_components-20051222-r1.ebuild,v 1.6 2008/01/20 21:53:16 george Exp $ IUSE="doc" @@ -22,7 +22,7 @@ RDEPEND="virtual/gnat >=app-admin/eselect-gnat-0.7" DEPEND="${RDEPEND} - doc? ( app-arch/unzip )" + app-arch/unzip" lib_compile() { cd ${SL}/GNAT @@ -32,17 +32,17 @@ lib_compile() { lib_install() { # new style booch components install Debug and Release versions, we only # need the lib subdir of either - mkdir -p ${DL}/Debug + mkdir -p "${DL}"/Debug # both $SL and $DL are under ${WORKDIR}, so no dodir, doins... # (as lib_install is called from src_compile it is not safe to have $DL # under $D) - mv ${SL}/GNAT/*-Release/lib/* ${DL} - mv ${SL}/GNAT/*-Debug/lib/* ${DL}/Debug + mv "${SL}"/GNAT/*-Release/lib/* "${DL}" + mv "${SL}"/GNAT/*-Debug/lib/* "${DL}"/Debug } src_install () { dodir "${AdalibSpecsDir}/${PN}" - cd ${S} + cd "${S}" insinto "${AdalibSpecsDir}/${PN}" doins *.ad? @@ -54,14 +54,14 @@ src_install () { gnat_src_install # Install documentation. - dodoc COPYING README + dodoc README if use doc ; then einfo "installing docs" - cd ${WORKDIR} + cd "${WORKDIR}" dohtml *.html *.gif *.jpg - cp coldframe-hash.* x.ada ${D}/usr/share/doc/${PF}/html + cp coldframe-hash.* x.ada "${D}"/usr/share/doc/${PF}/html - cd ${S} + cd "${S}" dodir /usr/share/doc/${PF}/demo insinto /usr/share/doc/${PF}/demo doins demo/* diff --git a/dev-ada/booch_components/booch_components-20070420.ebuild b/dev-ada/booch_components/booch_components-20070420.ebuild index f7a080524c17..3ab164cae4cb 100644 --- a/dev-ada/booch_components/booch_components-20070420.ebuild +++ b/dev-ada/booch_components/booch_components-20070420.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ada/booch_components/booch_components-20070420.ebuild,v 1.1 2007/05/31 14:47:41 george Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ada/booch_components/booch_components-20070420.ebuild,v 1.2 2008/01/20 21:53:16 george Exp $ IUSE="doc" @@ -21,22 +21,21 @@ SLOT="0" RDEPEND="virtual/gnat" DEPEND="${RDEPEND} - doc? ( app-arch/unzip )" + app-arch/unzip" lib_compile() { - cd ${SL}/GNAT + cd "${SL}"/GNAT make } lib_install() { - mkdir -p ${DL}/Debug - mv ${SL}/GNAT/*-Release/lib/* ${DL} - mv ${SL}/GNAT/*-Debug/lib/* ${DL}/Debug - chmod 0444 ${DL}/*.ali ${DL}/Debug/*.ali + mkdir -p "${DL}"/Debug + mv "${SL}"/GNAT/*-Release/lib/* "${DL}" + mv "${SL}"/GNAT/*-Debug/lib/* "${DL}"/Debug + chmod 0444 "${DL}"/*.ali "${DL}"/Debug/*.ali } src_install () { - cd ${S} dodir "${AdalibSpecsDir}/${PN}" insinto "${AdalibSpecsDir}/${PN}" doins *.ad? @@ -49,14 +48,14 @@ src_install () { gnat_src_install # Install documentation. - dodoc COPYING README + dodoc README if use doc ; then einfo "installing docs" - cd ${WORKDIR} + cd "${WORKDIR}" dohtml *.html *.gif *.jpg - cp coldframe-hash.* x.ada ${D}/usr/share/doc/${PF}/html + cp coldframe-hash.* x.ada "${D}"/usr/share/doc/${PF}/html - cd ${S} + cd "${S}" dodir /usr/share/doc/${PF}/demo insinto /usr/share/doc/${PF}/demo doins demo/* -- cgit v1.2.3-65-gdbad