diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2015-05-25 19:12:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2015-05-25 19:12:07 +0000 |
| commit | 85de4641b6917f63acd87bea4751155f79ab26da (patch) | |
| tree | 3417ed19b12d3bf6f313865ec8645de3a001caf4 /app-admin | |
| parent | Clean up old. (diff) | |
| download | gentoo-2-85de4641b6917f63acd87bea4751155f79ab26da.tar.gz gentoo-2-85de4641b6917f63acd87bea4751155f79ab26da.tar.bz2 gentoo-2-85de4641b6917f63acd87bea4751155f79ab26da.zip | |
Prune installed files.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key FDE8EF85AE5719A3)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/consul/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/consul/consul-0.5.2.ebuild | 15 | ||||
| -rw-r--r-- | app-admin/consul/consul-9999.ebuild | 15 |
3 files changed, 29 insertions, 7 deletions
diff --git a/app-admin/consul/ChangeLog b/app-admin/consul/ChangeLog index 08e7a9c9e3d0..2dba9a769f47 100644 --- a/app-admin/consul/ChangeLog +++ b/app-admin/consul/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/consul # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/consul/ChangeLog,v 1.2 2015/05/24 21:38:02 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/consul/ChangeLog,v 1.3 2015/05/25 19:12:07 zmedico Exp $ + + 25 May 2015; Zac Medico <zmedico@gentoo.org> consul-0.5.2.ebuild, + consul-9999.ebuild: + Prune installed files. 24 May 2015; Zac Medico <zmedico@gentoo.org> consul-0.5.2.ebuild, consul-9999.ebuild: diff --git a/app-admin/consul/consul-0.5.2.ebuild b/app-admin/consul/consul-0.5.2.ebuild index f6362fc66774..8ac43d0ee78c 100644 --- a/app-admin/consul/consul-0.5.2.ebuild +++ b/app-admin/consul/consul-0.5.2.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/app-admin/consul/consul-0.5.2.ebuild,v 1.2 2015/05/24 21:38:02 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/consul/consul-0.5.2.ebuild,v 1.3 2015/05/25 19:12:07 zmedico Exp $ EAPI=5 @@ -143,7 +143,16 @@ src_install() { newconfd "${FILESDIR}/consul.confd" "${PN}" systemd_dounit "${FILESDIR}/consul.service" - insinto /usr/lib/go find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null - doins -r "${WORKDIR}"/{pkg,src} + find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete + while read -r -d '' x; do + x=${x#${WORKDIR}/src} + [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} || + -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue + rm -rf "${WORKDIR}"/src/${x} + done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) + insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*} + doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN} + insinto /usr/lib/go/src/${GO_PN%/*} + doins -r "${WORKDIR}"/src/${GO_PN} } diff --git a/app-admin/consul/consul-9999.ebuild b/app-admin/consul/consul-9999.ebuild index 462b6a5f90a8..78ca5d8c124b 100644 --- a/app-admin/consul/consul-9999.ebuild +++ b/app-admin/consul/consul-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/app-admin/consul/consul-9999.ebuild,v 1.2 2015/05/24 21:38:02 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/consul/consul-9999.ebuild,v 1.3 2015/05/25 19:12:07 zmedico Exp $ EAPI=5 @@ -99,7 +99,16 @@ src_install() { newconfd "${FILESDIR}/consul.confd" "${PN}" systemd_dounit "${FILESDIR}/consul.service" - insinto /usr/lib/go find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null - doins -r "${WORKDIR}"/{pkg,src} + find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete + while read -r -d '' x; do + x=${x#${WORKDIR}/src} + [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} || + -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue + rm -rf "${WORKDIR}"/src/${x} + done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) + insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*} + doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN} + insinto /usr/lib/go/src/${GO_PN%/*} + doins -r "${WORKDIR}"/src/${GO_PN} } |