commit: 4168b723fc0979e22c6fbd1b39e71b47c109a5f4 Author: Lucas Ramage <ramage.lucas <AT> protonmail <DOT> com> AuthorDate: Tue Mar 5 02:37:09 2019 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Mon Mar 18 22:48:30 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4168b723
sys-apps/proot: update metadata, add 9999 version. Closes: https://bugs.gentoo.org/675460 Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Lucas Ramage <ramage.lucas <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/11261 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> sys-apps/proot/metadata.xml | 10 ++++------ ...{proot-5.1.0-r1.ebuild => proot-5.1.0-r2.ebuild} | 21 ++++++++++++++++----- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/sys-apps/proot/metadata.xml b/sys-apps/proot/metadata.xml index d2757b2e50d..f8c3c4c1281 100644 --- a/sys-apps/proot/metadata.xml +++ b/sys-apps/proot/metadata.xml @@ -12,13 +12,11 @@ transparently through QEMU user-mode. </longdescription> <upstream> - <remote-id type="github">cedric-vincent/PRoot</remote-id> - <maintainer> - <email>gen...@reproducible.io</email> - <name>Cédric Vincent</name> - </maintainer> + <bugs-to>mailto:proot...@googlegroups.com</bugs-to> + <changelog>https://raw.githubusercontent.com/proot-me/PRoot/master/doc/proot/changelog.txt</changelog> + <remote-id type="github">proot-me/PRoot</remote-id> </upstream> <use> - <flag name="care">Build dynamic CARE binary (more info - http://reproducible.io/)</flag> + <flag name="care">Build dynamic CARE binary (more info - https://proot-me.github.io)</flag> </use> </pkgmetadata> diff --git a/sys-apps/proot/proot-5.1.0-r1.ebuild b/sys-apps/proot/proot-5.1.0-r2.ebuild similarity index 79% rename from sys-apps/proot/proot-5.1.0-r1.ebuild rename to sys-apps/proot/proot-5.1.0-r2.ebuild index d8436f73338..ac2eea07dbf 100644 --- a/sys-apps/proot/proot-5.1.0-r1.ebuild +++ b/sys-apps/proot/proot-5.1.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,14 +6,20 @@ MY_PN="PRoot" inherit eutils toolchain-funcs +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/proot-me/${MY_PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc" -HOMEPAGE="https://proot-me.github.io/" -SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://proot-me.github.io" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="care test" +IUSE="care static test" RDEPEND="care? ( app-arch/libarchive:0= ) sys-libs/talloc" @@ -32,6 +38,11 @@ PATCHES=( "${FILESDIR}/${PN}-5.1.0-loader.patch" ) +src_prepare() { + default + use static && append-ldflags -static +} + src_compile() { # build the proot and care targets emake -C src V=1 \