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 0FAD7138334 for ; Tue, 23 Jul 2019 21:45:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D53BE0864; Tue, 23 Jul 2019 21:44:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 20011E0864 for ; Tue, 23 Jul 2019 21:44:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA599347F96 for ; Tue, 23 Jul 2019 21:44:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5CB7471 for ; Tue, 23 Jul 2019 21:44:55 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1563918275.810fc7b7e33434e249d847c126e0db58091e2ea1.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools-ng/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.4.2.ebuild sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild X-VCS-Directories: sys-fs/squashfs-tools-ng/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 810fc7b7e33434e249d847c126e0db58091e2ea1 X-VCS-Branch: master Date: Tue, 23 Jul 2019 21:44:55 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6c6b504d-2fbd-4d1f-99d5-efc31d361e68 X-Archives-Hash: a92f5f686f1f526082cf08ab1da40e0f commit: 810fc7b7e33434e249d847c126e0db58091e2ea1 Author: Lars Wendler gentoo org> AuthorDate: Tue Jul 23 08:03:06 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Jul 23 21:44:35 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=810fc7b7 sys-fs/squashfs-tools-ng: Simplified ebuilds a bit Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> Signed-off-by: Matt Turner gentoo.org> sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.4.2.ebuild | 10 ++-------- sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.4.2.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.4.2.ebuild index 88b9fdc8179..a57e5398eef 100644 --- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.4.2.ebuild +++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.4.2.ebuild @@ -3,13 +3,12 @@ EAPI=7 -EGIT_REPO_URI="https://github.com/AgentD/${PN}.git" -[[ ${PV} == 9999* ]] && inherit autotools git-r3 DESCRIPTION="A new set of tools for working with SquashFS images" HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng" if [[ ${PV} = 9999* ]]; then - SRC_URI="" + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/AgentD/${PN}.git" else KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64" SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz" @@ -30,11 +29,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_unpack() { - default - [[ $PV = 9999* ]] && git-r3_src_unpack -} - src_prepare() { default [[ ${PV} == "9999" ]] && eautoreconf diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild index 88b9fdc8179..a57e5398eef 100644 --- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild +++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild @@ -3,13 +3,12 @@ EAPI=7 -EGIT_REPO_URI="https://github.com/AgentD/${PN}.git" -[[ ${PV} == 9999* ]] && inherit autotools git-r3 DESCRIPTION="A new set of tools for working with SquashFS images" HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng" if [[ ${PV} = 9999* ]]; then - SRC_URI="" + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/AgentD/${PN}.git" else KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64" SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz" @@ -30,11 +29,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_unpack() { - default - [[ $PV = 9999* ]] && git-r3_src_unpack -} - src_prepare() { default [[ ${PV} == "9999" ]] && eautoreconf