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 8A41B138335 for ; Mon, 15 Jul 2019 12:58:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64E74E097A; Mon, 15 Jul 2019 12:58:10 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 4CA0AE097A for ; Mon, 15 Jul 2019 12:58:10 +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 4DB9D347C1B for ; Mon, 15 Jul 2019 12:58:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30B206F2 for ; Mon, 15 Jul 2019 12:58:07 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1563195439.fb657b323413d134f7b130960b29cc2b07bce678.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/subversion.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: fb657b323413d134f7b130960b29cc2b07bce678 X-VCS-Branch: master Date: Mon, 15 Jul 2019 12:58:07 +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: 65b88b37-710c-4dda-8b43-3f3580767f3b X-Archives-Hash: 5a3ce64d0c4c3cbd13fe3988e72d75fa commit: fb657b323413d134f7b130960b29cc2b07bce678 Author: Ulrich Müller gentoo org> AuthorDate: Mon Jul 15 12:57:19 2019 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Jul 15 12:57:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb657b32 [QA] Revert "subversion.eclass: EAPI-7 ready" This reverts commit e446335fd32a2fc34fbc90842e96316a413762eb. Acked-by: Lars Wendler gentoo.org> Signed-off-by: Ulrich Müller gentoo.org> eclass/subversion.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index 39d85f7c89c..d9f9daf7eb6 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -12,20 +12,20 @@ # The subversion eclass provides functions to fetch, patch and bootstrap # software sources from subversion repositories. +inherit eutils + ESVN="${ECLASS}" case "${EAPI:-0}" in 0|1) - inherit eutils EXPORT_FUNCTIONS src_unpack pkg_preinst DEPEND="dev-vcs/subversion" ;; 2|3|4|5) - inherit eutils EXPORT_FUNCTIONS src_unpack src_prepare pkg_preinst DEPEND="|| ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] )" ;; - 6|7) + 6) EXPORT_FUNCTIONS src_unpack pkg_preinst DEPEND="|| ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] )" ;;