From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 66499138D57 for ; Mon, 24 Oct 2016 21:48:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C596EE0AD7; Mon, 24 Oct 2016 21:48:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEF88E0AD7 for ; Mon, 24 Oct 2016 21:48:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE6453416B2 for ; Mon, 24 Oct 2016 21:48:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B9C024A0 for ; Mon, 24 Oct 2016 21:48:44 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1477345714.071e1af15ef25155f6ca12ebe2713e48241d9590.mrueg@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/certbot-apache/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/certbot-apache/certbot-apache-9999.ebuild X-VCS-Directories: app-crypt/certbot-apache/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: 071e1af15ef25155f6ca12ebe2713e48241d9590 X-VCS-Branch: master Date: Mon, 24 Oct 2016 21:48:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2aff7eeb-e4b9-4d4d-b264-ac479dfe3f74 X-Archives-Hash: f2be02f6263ebe13cce5a802b8b176a1 commit: 071e1af15ef25155f6ca12ebe2713e48241d9590 Author: Manuel Rüger gentoo org> AuthorDate: Mon Oct 24 21:47:54 2016 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Mon Oct 24 21:48:34 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071e1af1 app-crypt/certbot-apache: Sync live Package-Manager: portage-2.3.2 app-crypt/certbot-apache/certbot-apache-9999.ebuild | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild index 5714f37..0363587 100644 --- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild +++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild @@ -5,20 +5,27 @@ EAPI=5 PYTHON_COMPAT=(python2_7) -EGIT_REPO_URI="https://github.com/certbot/certbot.git" - -inherit git-r3 distutils-r1 +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + inherit git-r3 + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz" + KEYWORDS="~amd64" + S=${WORKDIR}/${PN%-apache}-${PV}/${PN} +fi + +inherit distutils-r1 DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)" HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="" IUSE="test" -RDEPEND="app-crypt/certbot[${PYTHON_USEDEP}] - app-crypt/acme[${PYTHON_USEDEP}] +RDEPEND="~app-crypt/certbot-${PV}[${PYTHON_USEDEP}] + ~app-crypt/acme-${PV}[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] dev-python/python-augeas[${PYTHON_USEDEP}] dev-python/zope-component[${PYTHON_USEDEP}] @@ -27,8 +34,6 @@ DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] ) dev-python/setuptools[${PYTHON_USEDEP}]" -S=${WORKDIR}/${P}/certbot-apache - python_test() { nosetests || die }