zmedico 15/05/25 19:12:07 Modified: consul-0.5.2.ebuild consul-9999.ebuild ChangeLog Log: Prune installed files. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key FDE8EF85AE5719A3)
Revision Changes Path 1.3 app-admin/consul/consul-0.5.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/consul/consul-0.5.2.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/consul/consul-0.5.2.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/consul/consul-0.5.2.ebuild?r1=1.2&r2=1.3 Index: consul-0.5.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/consul/consul-0.5.2.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- consul-0.5.2.ebuild 24 May 2015 21:38:02 -0000 1.2 +++ consul-0.5.2.ebuild 25 May 2015 19:12:07 -0000 1.3 @@ -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 @@ 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} } 1.3 app-admin/consul/consul-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/consul/consul-9999.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/consul/consul-9999.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/consul/consul-9999.ebuild?r1=1.2&r2=1.3 Index: consul-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/consul/consul-9999.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- consul-9999.ebuild 24 May 2015 21:38:02 -0000 1.2 +++ consul-9999.ebuild 25 May 2015 19:12:07 -0000 1.3 @@ -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 @@ 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} } 1.3 app-admin/consul/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/consul/ChangeLog?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/consul/ChangeLog?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/consul/ChangeLog?r1=1.2&r2=1.3 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/consul/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ChangeLog 24 May 2015 21:38:02 -0000 1.2 +++ ChangeLog 25 May 2015 19:12:07 -0000 1.3 @@ -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 <[email protected]> consul-0.5.2.ebuild, + consul-9999.ebuild: + Prune installed files. 24 May 2015; Zac Medico <[email protected]> consul-0.5.2.ebuild, consul-9999.ebuild:
